--- a/Object.st	Thu Mar 27 16:48:47 1997 +0100
+++ b/Object.st	Thu Mar 27 18:22:41 1997 +0100
@@ -2168,7 +2168,7 @@
     ].
 
     context := thisContext.
-    context := context sender.
+    context := context findNextContextWithSelector:aSelector or:nil.
     [context notNil] whileTrue:[
         ((context receiver class == Debugger) 
          and:[context selector == aSelector]) ifTrue:[
@@ -2187,12 +2187,13 @@
              lets try MiniDebugger"
             ^ MiniDebugger
         ].
-        context := context sender
+        context := context findNextContextWithSelector:aSelector or:nil.
     ].
     "not within Debugger - no problem"
     ^ Debugger
 
     "Modified: 23.9.1996 / 12:14:52 / stefan"
+    "Modified: 27.3.1997 / 18:21:07 / cg"
 !
 
 cannotSendMessage:aMessage to:someReceiver
@@ -5760,6 +5761,6 @@
 !Object class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Object.st,v 1.187 1997-03-27 13:27:01 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Object.st,v 1.188 1997-03-27 17:22:41 cg Exp $'
 ! !
 Object initialize!