diff --git a/ChangeLog b/ChangeLog
index 41015e3..045b8c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-12  Mirko Viviani  <mirko.viviani@rccr.cremona.it>
+
+	* EOControl/EOClassDescription.m ([EOClassDescription +initialize]):
+	initialize (if present) the default model group. This helps
+	+classDescriptionFor* to work correctly.
+
 2003-03-06  David Ayers  <d.ayers@inode.at>
 
 	* config/postgres.m4:  Updated CPPFLAGS and LIBS to account for
diff --git a/EOControl/EOClassDescription.m b/EOControl/EOClassDescription.m
index e716505..e23787b 100644
--- a/EOControl/EOClassDescription.m
+++ b/EOControl/EOClassDescription.m
@@ -82,6 +82,14 @@ static id classDelegate = nil;
   classDescriptionForEntity = NSCreateMapTable(NSObjectMapKeyCallBacks, 
 					       NSObjectMapValueCallBacks,
 					       32);
+
+  if (self == [EOClassDescription class])
+    {
+      Class cls = NSClassFromString(@"EOModelGroup");
+
+      if (cls != Nil)
+	[cls defaultGroup]; // Insure correct initialization.
+    }
 }