--- a/Class.st	Wed Jan 17 19:35:41 1996 +0100
+++ b/Class.st	Wed Jan 17 19:36:45 1996 +0100
@@ -1014,6 +1014,9 @@
 
 	sel := self class selectorArray at:i.
 	m := self class methodArray at:i.
+	m isLazyMethod ifTrue:[
+	    m := m asRealMethod
+	].
 
 	sel storeBinaryOn:stream manager:manager.
 	m storeFullBinaryDefinitionOn:stream manager:manager
@@ -1030,6 +1033,9 @@
 
 	sel := selectorArray at:i.
 	m := methodArray at:i.
+	m isLazyMethod ifTrue:[
+	    m := m asRealMethod
+	].
 
 	sel storeBinaryOn:stream manager:manager.
 	m storeFullBinaryDefinitionOn:stream manager:manager
@@ -1075,6 +1081,12 @@
     "/   classInstVarNames
 
     superclassName := manager nextObject.
+
+    superClass := Smalltalk at:superclassName ifAbsent:nil.
+    superClass notNil ifTrue:[
+	superClass autoload.
+    ].
+
     name := manager nextObject.
     flags := manager nextObject.
     instvars := manager nextObject.
@@ -1085,11 +1097,12 @@
     classInstVars := manager nextObject.
     classInstVars isNil ifTrue:[classInstVars := ''].
 
-    superClass := Smalltalk at:superclassName ifAbsent:nil.
-    superClass notNil ifTrue:[
-	superClass autoload.
-    ].
-
+    newClass := superClass
+                    subclass:name asSymbol
+                    instanceVariableNames:instvars
+                    classVariableNames:classvars
+                    poolDictionaries:''
+                    category:category.
 
 "/    'got superName:' print. superclassName printNL.
 "/    'got name:' print. name printNL.
@@ -1136,13 +1149,6 @@
     ].
 
     superClass isNil ifTrue:[^ nil].
-
-    newClass := superClass
-		    subclass:name asSymbol
-		    instanceVariableNames:instvars
-		    classVariableNames:classvars
-		    poolDictionaries:''
-		    category:category.
     newClass isNil ifTrue:[
 	^ nil
     ].
@@ -3615,6 +3621,6 @@
 !Class class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.116 1996-01-16 19:11:04 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.117 1996-01-17 18:36:36 cg Exp $'
 ! !
 Class initialize!