--- a/UIPainter.st	Fri Jan 11 12:43:05 2008 +0100
+++ b/UIPainter.st	Fri Jan 11 13:40:47 2008 +0100
@@ -4154,11 +4154,11 @@
 
     self askForSectionModification.
 
-    cls := self targetClass.
+    cls := self painter targetClass.
 
     aspectList := OrderedCollection new.
 
-    self aspectSelectorsAndTypesDo:
+    self painter aspectSelectorsAndTypesDo:
         [:selector :type |
             |newEntry|
 
@@ -4206,7 +4206,7 @@
     code readStream fileIn.
 
     "/ refetch - cls is now obsolete
-    cls := self targetClass.
+    cls := self painter targetClass.
 
     doBrowse ifTrue:[
         methods := selectorsToGenerateCode