--- a/Autoload.st	Mon Jan 15 13:20:09 1996 +0100
+++ b/Autoload.st	Mon Jan 15 15:04:23 1996 +0100
@@ -216,7 +216,11 @@
     "load it"
     Transcript showCr:('autoloading ', myName , ' ...'); endEntry.
 
-    Smalltalk fileInClass:myName initialize:false lazy:LazyLoading.
+    [
+	Smalltalk fileInClass:myName initialize:false lazy:LazyLoading.
+    ] valueOnUnwindDo:[
+	Smalltalk at:myName put:mySelf.
+    ].
 
     "did it work ?"
     newClass := Smalltalk at:myName.
@@ -253,7 +257,7 @@
     "wow - it worked. now the big trick ..."
 
     newClass class setSoleInstance:self.   "/ will be undone by become ...
-    self become:newClass.
+    self becomeSameAs:newClass.
     LoadedClasses rehash.
     self initialize.            "/ thats the new class now
     self postAutoload.
@@ -362,6 +366,6 @@
 !Autoload class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Autoload.st,v 1.37 1995-12-19 19:13:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Autoload.st,v 1.38 1996-01-15 14:04:23 cg Exp $'
 ! !
 Autoload initialize!