--- a/MemoryUsageView.st	Wed May 11 14:40:06 2011 +0200
+++ b/MemoryUsageView.st	Wed May 11 14:51:27 2011 +0200
@@ -515,12 +515,21 @@
      special kludge
     "
     class isSymbol ifTrue:[
-        class == #NameSpace ifFalse:[
-            ^ UserPreferences current systemBrowserClass open
+        class == #NameSpace ifTrue:[
+            class := (Smalltalk at:class) class.
+            insts := class allSubInstances.
+            insts remove:class soleInstance ifAbsent:nil
+        ] ifFalse:[
+            class == #Metaclass ifTrue:[
+                insts := Metaclass allSubInstances.
+            ] ifFalse:[
+                class == #Class ifTrue:[
+                    insts := Class allSubInstances.
+                ] ifFalse:[
+                    ^ self.
+                ].
+            ]
         ].
-        class := (Smalltalk at:class) class.
-        insts := class allSubInstances.
-        insts remove:class soleInstance ifAbsent:nil
     ] ifFalse:[
         insts := class allInstances.
     ].
@@ -703,7 +712,7 @@
             ].
         ].
         
-        info := rawInfo asSortedCollection:sortBlock.
+        info := (OrderedCollection withAll:rawInfo) sort:sortBlock.
 
         sumSizes := info collect:[:infoEntry | infoEntry overallByteSize ].
         allMemory := sumSizes sum.
@@ -759,11 +768,13 @@
         line := line , (100.0 printStringLeftPaddedTo:accumMemoryUseLen).
         l addFirst:line.
 
+        info addFirst:nil; addFirst:nil.
+
         list list:l.
     ]
 
     "Created: / 19-09-1995 / 15:30:47 / claus"
-    "Modified: / 05-05-2011 / 17:15:29 / cg"
+    "Modified: / 11-05-2011 / 14:47:52 / cg"
 !
 
 updateInfo
@@ -975,9 +986,9 @@
 !MemoryUsageView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/MemoryUsageView.st,v 1.58 2011-05-11 12:40:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/MemoryUsageView.st,v 1.59 2011-05-11 12:51:27 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/MemoryUsageView.st,v 1.58 2011-05-11 12:40:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/MemoryUsageView.st,v 1.59 2011-05-11 12:51:27 cg Exp $'
 ! !