--- a/ClassBuilder.st	Tue Nov 10 07:06:23 2015 +0100
+++ b/ClassBuilder.st	Fri Nov 13 06:40:14 2015 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2001 by eXept Software AG
               All Rights Reserved
@@ -1275,17 +1273,16 @@
 handleHardNewClass:newClass
     |oldCategory|
 
-    Class flushSubclassInfoFor:oldSuperClass.
-    Class flushSubclassInfoFor:newSuperClass.
-
     "/ don't allow built-in classes to be modified this way
     (superClassChange and:[oldClass notNil and:[oldClass isBuiltInClass]]) ifTrue:[
         ClassBuildError raiseErrorString:'the inheritance of this class is fixed - you cannot change it'.
         ^ oldClass
     ].
 
-"/    "/ since we will change the inheritance of some class(es)
-"/    Class flushSubclassInfo.
+    "/ since we will change the inheritance of some class(es)
+    Class 
+        flushSubclassInfoFor:oldSuperClass;
+        flushSubclassInfoFor:newSuperClass.
 
     "/ catch special case, where superclass changed its layout and thus
     "/ forced redefinition of this class; 
@@ -2396,11 +2393,11 @@
 !ClassBuilder class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ClassBuilder.st,v 1.136 2015-03-27 10:41:00 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/ClassBuilder.st,v 1.136 2015-03-27 10:41:00 stefan Exp $'
+    ^ '$Header$'
 ! !