diff --git a/ChangeLog b/ChangeLog
index 79e2151a9..ba30454ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-09-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoObject.m ([SOGoObject
+	-initWithName:_nameinContainer:_container]): we no longer retain
+	the context, to avoid making a circular reference.
+
 	* SoObjects/SOGo/SOGoUser.m ([SOGoUser
 	-initWithLogin:newLoginroles:newRoles]): moved the core from init
 	here.
diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m
index 2e8e526fe..580efdc11 100644
--- a/SoObjects/SOGo/SOGoObject.m
+++ b/SoObjects/SOGo/SOGoObject.m
@@ -270,7 +270,6 @@ SEL SOGoSelectorForPropertySetter (NSString *property)
   if ((self = [self init]))
     {
       context = [[WOApplication application] context];
-      [context retain];
       nameInContainer = [_name copy];
       container = _container;
       if ([self doesRetainContainer])
@@ -285,7 +284,6 @@ SEL SOGoSelectorForPropertySetter (NSString *property)
 
 - (void) dealloc
 {
-  [context release];
   [owner release];
   if ([self doesRetainContainer])
     [container release];
@@ -402,7 +400,7 @@ SEL SOGoSelectorForPropertySetter (NSString *property)
 	{
 	  obj = [[self soClass] lookupKey: lookupName inContext: localContext];
 	  if (obj)
-	    [obj bindToObject: self inContext: localContext];
+	    obj = [obj bindToObject: self inContext: localContext];
 	}
 
       if (obj)