--- a/Metaclass.st	Wed Aug 08 10:22:26 2018 +0200
+++ b/Metaclass.st	Wed Aug 08 10:23:07 2018 +0200
@@ -447,7 +447,7 @@
 
 "/  No, always use namespace pragma, otherwise when reading back
 "/  from stream, we need somehow to tell what's namespace and what's
-"/  a private class in another class. So namespaces are **aleays** denoted by
+"/  a private class in another class. So namespaces are **always** denoted by
 "/  namespace pragma.
 
     "/ the backward compatible namespace directive is only used
@@ -479,7 +479,11 @@
                 "/ reason: the fileout might go into a big file containing multiple classes
                 "/ in different namespaces (otherwise, the smalltalk class would later be filed into
                 "/ the previous class's namespace)
-                aStream nextPutAll:'"{ NameSpace: Smalltalk }"'; cr; cr.
+                (Smalltalk at:aClass name) == aClass ifTrue:[
+                    aStream nextPutAll:'"{ NameSpace: Smalltalk }"'; cr; cr.
+                ] ifFalse:[
+                    aStream nextPutAll:'"{ NameSpace: nil }"'; cr; cr.
+                ].    
             ].
         ].
     ].
@@ -643,6 +647,7 @@
     "Modified: / 18-03-1999 / 18:15:46 / stefan"
     "Modified: / 08-10-2007 / 13:28:59 / cg"
     "Modified: / 06-03-2014 / 10:32:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 08-08-2018 / 09:06:17 / Claus Gittinger"
 !
 
 fileOutClassInstVarDefinitionOn:aStream withNameSpace:withNameSpace