--- a/Query.st	Tue Aug 03 14:51:01 1999 +0200
+++ b/Query.st	Tue Aug 03 14:55:02 1999 +0200
@@ -257,7 +257,7 @@
     |arg|
 
     theContext selector == #'answer:do:' ifTrue:[
-        (self accepts:signal) ifTrue:[
+        (self == signal or:[self accepts:signal]) ifTrue:[
             arg := theContext argAt:1.
             ^ [:ex| ex proceedWith:arg].
         ]
@@ -293,7 +293,7 @@
         (s := con receiver) == self ifTrue:[
             ^ con argAt:1
         ].
-        (s accepts:self) ifTrue:[
+        (s == self or:[s accepts:self]) ifTrue:[
             ^ super raiseRequest
         ].
         con := con findSpecialHandle:true raise:false.
@@ -337,5 +337,5 @@
 !Query class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Query.st,v 1.5 1999-08-02 15:03:35 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Query.st,v 1.6 1999-08-03 12:53:14 cg Exp $'
 ! !