Index: TODO
===================================================================
diff -u -rb053832535f9d1903fc0c0c3cb3523653bd63dfe -rede10bf0265c3943458771665317aa0c12971900
--- TODO	(.../TODO)	(revision b053832535f9d1903fc0c0c3cb3523653bd63dfe)
+++ TODO	(.../TODO)	(revision ede10bf0265c3943458771665317aa0c12971900)
@@ -4035,6 +4035,9 @@
 - handle cyclical class dependencies during object system finalize
 - extend regression test
 
+nsf.c:
+- handle cyclical superclassclass dependencies during object system finalize
+- extend regression test
 
 ========================================================================
 TODO:
Index: generic/nsf.c
===================================================================
diff -u -rb053832535f9d1903fc0c0c3cb3523653bd63dfe -rede10bf0265c3943458771665317aa0c12971900
--- generic/nsf.c	(.../nsf.c)	(revision b053832535f9d1903fc0c0c3cb3523653bd63dfe)
+++ generic/nsf.c	(.../nsf.c)	(revision ede10bf0265c3943458771665317aa0c12971900)
@@ -24428,9 +24428,10 @@
       int reclassed = 0;
 
       /* 
-       * Final check. If there are no cyclical dependencies, we should have now
-       * just the the base classes left. If this is not the case, reclass the
-       * remaining objects to their base classes.
+       * Final check. If there are no cyclical dependencies, we should have
+       * now just the the base classes left. If this is not the case, reclass
+       * the remaining objects to their base classes, and set the superclasses
+       * to the most general superclass.
        */
       for (entry = *instances, lastEntry = NULL;
 	   entry;
@@ -24444,9 +24445,32 @@
 	} 
 	
 	osPtr = GetObjectSystem(object);
+
+	/*
+	 * For classes, check the superclass hierarchy.
+	 */
+	if (NsfObjectIsClass(object)) {
+	  NsfClass *cl = (NsfClass *)object;
+	  NsfClasses *sc;
+
+	  for (sc = cl->super; sc; sc = sc->nextPtr) {
+	    if (sc->cl != osPtr->rootClass) {
+	      Tcl_Obj *objectName = osPtr->rootClass->object.cmdName;
+	      SuperclassAdd(interp, cl, 1, &objectName, objectName, cl->object.cl);
+	      reclassed ++;
+	      break;
+	    }
+	  }
+	}
+
+	/* 
+	 * In all cases, straigthen the class to the base case.
+	 */
 	baseClass = NsfObjectIsClass(object) ? osPtr->rootMetaClass : osPtr->rootClass;
-	ChangeClass(interp, object, baseClass);
-	reclassed ++;
+	if (object->cl != baseClass) {
+	  ChangeClass(interp, object, baseClass);
+	  reclassed ++;
+	}
       }
       /*fprintf(stderr, "We have reclassed %d objects\n", reclassed);*/
 
Index: tests/destroy.test
===================================================================
diff -u -rb053832535f9d1903fc0c0c3cb3523653bd63dfe -rede10bf0265c3943458771665317aa0c12971900
--- tests/destroy.test	(.../destroy.test)	(revision b053832535f9d1903fc0c0c3cb3523653bd63dfe)
+++ tests/destroy.test	(.../destroy.test)	(revision ede10bf0265c3943458771665317aa0c12971900)
@@ -993,3 +993,20 @@
 nx::Class create o1::C
 nsf::relation o1 class o1::C
 
+#
+# Create a cyclical superclass dependency and delete it manually
+#
+nx::Test case cyclical-dependency {
+  nx::Class create C 
+  nx::Class create C::*
+  ? {nsf::relation C superclass {C::* nx::Object}} ""
+  C destroy
+}
+
+#
+# Create a cyclical superclass dependency and let it be deleted on
+# object-system-cleanup
+#
+nx::Class create C 
+nx::Class create C::*
+nsf::relation C superclass {C::* nx::Object}