diff --git a/SOPE/GDLContentStore/ChangeLog b/SOPE/GDLContentStore/ChangeLog
index e3f938155..fd54b2858 100644
--- a/SOPE/GDLContentStore/ChangeLog
+++ b/SOPE/GDLContentStore/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-21  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* GCSFolderManager.m ([GCSFolderManager
+	-baseTableNameWithUID:_uid]): the id was too long for the quick
+	tables, we reduce the length of the increment string to 3
+	characters instead of 8.
+
 2008-01-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* GCSFolderManager.m ([GCSFolderManager -baseTableNameWithUID:]):
diff --git a/SOPE/GDLContentStore/GCSFolderManager.m b/SOPE/GDLContentStore/GCSFolderManager.m
index 438145a74..184813849 100644
--- a/SOPE/GDLContentStore/GCSFolderManager.m
+++ b/SOPE/GDLContentStore/GCSFolderManager.m
@@ -627,7 +627,8 @@ static NSCharacterSet *asciiAlphaNumericCS  = nil;
   return [self folderForRecord:record];
 }
 
-- (NSString *)baseTableNameWithUID:(NSString *)_uid {
+- (NSString *) baseTableNameWithUID: (NSString *) _uid
+{
   unichar currentChar;
   unsigned int count, max, done;
   NSMutableString *newUID;
@@ -649,8 +650,8 @@ static NSCharacterSet *asciiAlphaNumericCS  = nil;
     }
   randInc++;
 
-  return [NSString stringWithFormat: @"%@%.8x%.8x",
-		   newUID, randInc, (unsigned int) rand()];
+  return [NSString stringWithFormat: @"%@%.3x%.8x",
+		   newUID, randInc & 0xfff, (unsigned int) rand()];
 }
 
 - (NSException *)createFolderOfType:(NSString *)_type