--- a/CodeGeneratorTool.st	Tue Nov 10 20:39:39 2009 +0100
+++ b/CodeGeneratorTool.st	Tue Nov 10 20:40:12 2009 +0100
@@ -2015,7 +2015,7 @@
 
             "/ default for lazy on class side
             lazyInitialization ifTrue:[
-                (aClass class includesSelector:(defaultMethodName asSymbol)) ifFalse:[
+                (aClass theMetaclass includesSelector:(defaultMethodName asSymbol)) ifFalse:[
                     source := defaultMethodName , '\'.
                     generateComments ifTrue:[
                         source := source , '    "default value for the ''%2'' instance variable (automatically generated)"\\'. 
@@ -2024,7 +2024,7 @@
                                , '    self shouldImplement.\'
                                , '    ^ nil.'.
                     source := (source bindWith:varType with:name) withCRs.
-                    self compile:source forClass:aClass class inCategory:'defaults'.
+                    self compile:source forClass:aClass theMetaclass inCategory:'defaults'.
                 ].
             ].
         ].
@@ -3153,9 +3153,9 @@
 !CodeGeneratorTool class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/CodeGeneratorTool.st,v 1.78 2009-11-06 19:04:11 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/CodeGeneratorTool.st,v 1.79 2009-11-10 19:40:12 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/CodeGeneratorTool.st,v 1.78 2009-11-06 19:04:11 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/CodeGeneratorTool.st,v 1.79 2009-11-10 19:40:12 cg Exp $'
 ! !