--- a/InstrumentationContext.st	Fri Dec 19 20:53:24 2014 +0100
+++ b/InstrumentationContext.st	Tue Dec 23 13:42:46 2014 +0100
@@ -84,7 +84,7 @@
     |p context|
 
     aProcess == LastProcess ifTrue:[
-        ^ LastInstrumentationContext
+        ^ LastInstrumentationContext ? GlobalInstrumentationContext
     ].
 
     "/ future (need a faster parentProcess query)
@@ -326,10 +326,10 @@
 !InstrumentationContext class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/InstrumentationContext.st,v 1.14 2014-05-23 11:48:59 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/InstrumentationContext.st,v 1.15 2014-12-23 12:42:46 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libcomp/InstrumentationContext.st,v 1.14 2014-05-23 11:48:59 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/InstrumentationContext.st,v 1.15 2014-12-23 12:42:46 cg Exp $'
 ! !