Index: generic/nsf.c
===================================================================
diff -u -r5972bd087afec6d23d1192d552a29c92e570d8a6 -r18d88a73e8c4aed2496085bcd9202537b0f7930e
--- generic/nsf.c	(.../nsf.c)	(revision 5972bd087afec6d23d1192d552a29c92e570d8a6)
+++ generic/nsf.c	(.../nsf.c)	(revision 18d88a73e8c4aed2496085bcd9202537b0f7930e)
@@ -10680,7 +10680,9 @@
   Tcl_DStringAppend(dsPtr, prefix, -1);
   slotContainerObject = GetObjectFromString(interp, Tcl_DStringValue(dsPtr));
 
-  if (slotContainerObject && slotContainerObject->nsPtr) {
+  if (slotContainerObject && slotContainerObject->nsPtr &&
+      //(slotContainerObject->flags & NSF_IS_SLOT_CONTAINER) &&
+      1) {
     Tcl_HashSearch hSrch;
     Tcl_HashEntry *hPtr;
     Tcl_HashTable *cmdTablePtr = Tcl_Namespace_cmdTablePtr(slotContainerObject->nsPtr);
@@ -19213,7 +19215,7 @@
   /*
    * First add the per-object slot objects
    */
-  if (1 && MethodSourceMatches(withSource, NULL, object)) {
+  if (MethodSourceMatches(withSource, NULL, object)) {
     AddSlotObjects(interp, object, "::per-object-slot", &slotTable,
 		   withSource, type, pattern, listObj);
   }