--- a/Future.st	Thu Dec 04 18:43:03 2014 +0100
+++ b/Future.st	Mon Dec 15 19:56:01 2014 +0100
@@ -317,12 +317,12 @@
 
     result isNil ifTrue:[
         IsDebuggingQuery query ifTrue:[
-            aMessage selector == #instVarAt: ifTrue:[
+            (#(instVarAt: isKindOf:) includes:aMessage selector) ifTrue:[
                 "enable debugging / inspecting"
-                ^ (Object compiledMethodAt:#instVarAt:)
+                ^ (Object compiledMethodAt:aMessage selector)
                     valueWithReceiver:self
                     arguments:aMessage arguments
-                    selector:#instVarAt:
+                    selector:aMessage selector
              ].
         ] ifFalse:[
             semaphore waitUncounted. "Wait for evaluation to complete"
@@ -359,10 +359,10 @@
 !Future class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/Future.st,v 1.18 2013-07-25 09:49:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/Future.st,v 1.19 2014-12-15 18:56:01 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic2/Future.st,v 1.18 2013-07-25 09:49:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/Future.st,v 1.19 2014-12-15 18:56:01 stefan Exp $'
 ! !