diff --git a/SOPE/GDLContentStore/ChangeLog b/SOPE/GDLContentStore/ChangeLog
index 56331bf37..296d55346 100644
--- a/SOPE/GDLContentStore/ChangeLog
+++ b/SOPE/GDLContentStore/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* GCSFolder.m (_tableRequirementForFields:andOrQualifier:): fixed
+	a double release of "allFields" occuring in the rare case where
+	the amount of fields would be 0.
+
 2009-09-10  Cyril Robert <crobert@inverse.ca>
 
 	* GCSFolder.m (deleteAllContent): New method to delete everything in the
diff --git a/SOPE/GDLContentStore/GCSFolder.m b/SOPE/GDLContentStore/GCSFolder.m
index d3c8943ed..5a6e08de9 100644
--- a/SOPE/GDLContentStore/GCSFolder.m
+++ b/SOPE/GDLContentStore/GCSFolder.m
@@ -295,7 +295,7 @@ static NSArray *contentFieldNames = nil;
   unsigned int fieldCount;
 
   requirement = noTableRequired;
-  allFields = [NSMutableArray new];
+  allFields = [NSMutableArray array];
   if ([fields count])
     [allFields addObjectsFromArray: fields];
   quFields = [[qualifier allQualifierKeys] allObjects];
@@ -314,13 +314,8 @@ static NSArray *contentFieldNames = nil;
 	requirement |= quickTableRequired;
     }
   else
-    {
-      [allFields release];
-      [NSException raise: @"GCSFolderMissingFieldNames"
-		   format: @"No field specified for query"];
-    }
-
-  [allFields release];
+    [NSException raise: @"GCSFolderMissingFieldNames"
+                format: @"No field specified for query"];
 
   return requirement;
 }
@@ -456,7 +451,7 @@ static NSArray *contentFieldNames = nil;
 	[sql appendString: [self storeTableName]];
     }
 
-  whereSql = [NSMutableArray new];
+  whereSql = [NSMutableArray array];
   if (qualifier)
     {
       whereString = [NSString stringWithFormat: @"(%@)",
@@ -476,7 +471,6 @@ static NSArray *contentFieldNames = nil;
   if ([whereSql count])
     [sql appendFormat: @" WHERE %@",
 	 [whereSql componentsJoinedByString: @" AND "]];
-  [whereSql release];
 
   sortOrderings = [spec sortOrderings];
   if ([sortOrderings count] > 0)