--- a/DebugView.st	Tue Oct 14 10:39:52 2008 +0200
+++ b/DebugView.st	Tue Oct 14 18:54:19 2008 +0200
@@ -4771,7 +4771,7 @@
             ^ self 
         ].
         (receiver class theNonMetaclass classVarNames includes:nm) ifTrue:[
-            aBlock value:(currentMethod mclass theNonMetaclass classVarAt:nm) value:'classVar ',nmBold.
+            aBlock value:((currentMethod mclass ? receiver class) theNonMetaclass classVarAt:nm) value:'classVar ',nmBold.
             ^ self 
         ].
         (Smalltalk includesKey:nm asSymbol) ifTrue:[
@@ -6511,7 +6511,7 @@
 !DebugView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.450 2008-10-10 10:22:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.451 2008-10-14 16:54:19 cg Exp $'
 ! !
 
 DebugView initialize!