--- a/Class.st	Sat Nov 25 19:18:20 1995 +0100
+++ b/Class.st	Sat Nov 25 20:10:38 1995 +0100
@@ -106,7 +106,7 @@
 !
 
 version
-^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.86 1995-11-25 18:18:20 cg Exp $'! !
+^ '$Header: /cvs/stx/stx/libbasic/Class.st,v 1.87 1995-11-25 19:10:38 cg Exp $'! !
 
 !Class class methodsFor:'initialization'!
 
@@ -2863,13 +2863,16 @@
     |cls meta m src val|
 
     self isMeta ifTrue:[
-	meta := self. cls := meta soleInstance
+	meta := self. cls := self soleInstance
     ] ifFalse:[
 	cls := self. meta := self class
     ].
 
     m := meta compiledMethodAt:#version.
-    m isNil ifTrue:[^ nil].
+    m isNil ifTrue:[
+	m := cls compiledMethodAt:#version.
+	m isNil ifTrue:[^ nil].
+    ].
 
     "/ if its a method returning the string,
     val := cls version.
@@ -2898,13 +2901,15 @@
     |lines idx val|
 
     lines := aMethodSourceString asCollectionOfLines.
-    idx := lines findFirst:[:l |
-	l withoutSpaces startsWith:'$Header'
+    lines do:[:l |
+	|i|
+
+	i := l indexOfSubCollection:'$Header: '.
+	i ~~ 0 ifTrue:[
+	    ^ l copyFrom:i
+	]
     ].
-    idx == 0 ifTrue:[^ nil].
-    ^ lines at:idx.
-
-    "Created: 15.11.1995 / 15:01:19 / cg"
+    ^ nil
 !
 
 setPrimitiveSpecsAt:index to:aString