--- a/Metaclass.st	Mon Jul 26 09:31:18 1999 +0200
+++ b/Metaclass.st	Mon Jul 26 09:34:08 1999 +0200
@@ -685,23 +685,19 @@
             "/
             "/ some consisteny checks
             "/
-            oldClass superclass notNil ifTrue:[
-                oldClass allSuperclasses do:[:cls |
+            oldClass allSuperclasses do:[:cls |
+                cls name = realNewName ifTrue:[
+                    self error:'trying to create circular class definition'.
+                    ^ nil
+                ]
+            ].
+
+            aClass notNil ifTrue:[
+                aClass allSuperclasses do:[:cls |
                     cls name = realNewName ifTrue:[
                         self error:'trying to create circular class definition'.
                         ^ nil
                     ]
-                ]
-            ].
-
-            aClass notNil ifTrue:[
-                aClass superclass notNil ifTrue:[
-                    aClass allSuperclasses do:[:cls |
-                        cls name = realNewName ifTrue:[
-                            self error:'trying to create circular class definition'.
-                            ^ nil
-                        ]
-                    ].
                 ].
             ].
 
@@ -2034,6 +2030,6 @@
 !Metaclass class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Metaclass.st,v 1.147 1999-07-16 18:49:45 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Metaclass.st,v 1.148 1999-07-26 07:33:49 cg Exp $'
 ! !
 Metaclass initialize!