--- a/MCClassDefinition.st	Wed Aug 05 16:06:12 2020 +0100
+++ b/MCClassDefinition.st	Mon Aug 10 12:48:14 2020 +0100
@@ -418,13 +418,17 @@
     | class |
 
     (class := self createClass) notNil ifTrue:[
-        class class instanceVariableNames: self classInstanceVariablesString.
+        self classInstanceVariablesString notEmptyOrNil ifTrue: [
+            class class instanceVariableNames: self classInstanceVariablesString.
+            class := self actualClass.
+        ].
         self hasComment ifTrue: [class classComment: comment stamp: commentStamp]
     ].
     class package: MCStXPackageQuery query.
 
     "Modified: / 14-09-2010 / 22:10:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 07-09-2011 / 13:01:53 / cg"
+    "Modified: / 10-08-2020 / 12:40:03 / Jan Vrany <jan.vrany@labware.com>"
 !
 
 stringForSortedVariablesOfType: aSymbol
@@ -667,6 +671,11 @@
     ^ '$Header: /cvs/stx/stx/goodies/monticello/MCClassDefinition.st,v 1.19 2015-03-01 01:06:15 cg Exp $'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
     ^ '$Id: MCClassDefinition.st,v 1.19 2015-03-01 01:06:15 cg Exp $'
 ! !