diff --git a/src/main/java/net/openhft/chronicle/hash/impl/stage/entry/SegmentStages.java b/src/main/java/net/openhft/chronicle/hash/impl/stage/entry/SegmentStages.java
index ee2fe9a7f..fba18cbe0 100644
--- a/src/main/java/net/openhft/chronicle/hash/impl/stage/entry/SegmentStages.java
+++ b/src/main/java/net/openhft/chronicle/hash/impl/stage/entry/SegmentStages.java
@@ -318,13 +318,8 @@ public abstract class SegmentStages implements SegmentLock, LocksInterface {
     private void linkToSegmentContextsChain() {
         LocksInterface innermostContextOnThisSegment = rootContextOnThisSegment;
         while (true) {
-            if (innermostContextOnThisSegment instanceof KeySearch) {
-                Data key = ((KeySearch) innermostContextOnThisSegment).inputKey;
-                if (Objects.equals(key, ((KeySearch) (Object) this).inputKey)) {
-                    throw new IllegalStateException("Nested same-thread contexts cannot access " +
-                            "the same key " + key);
-                }
-            }
+            checkNestedContextsQueryDifferentKeys(innermostContextOnThisSegment);
+
             if (innermostContextOnThisSegment.nextNode() == null)
                 break;
             innermostContextOnThisSegment = innermostContextOnThisSegment.nextNode();
@@ -332,6 +327,18 @@ public abstract class SegmentStages implements SegmentLock, LocksInterface {
         innermostContextOnThisSegment.setNextNode(this);
     }
 
+    public void checkNestedContextsQueryDifferentKeys(
+            LocksInterface innermostContextOnThisSegment) {
+        // TODO Spoon doesn't replace RHS instanceof occurances
+        if (innermostContextOnThisSegment.getClass() == this.getClass()) {
+            Data key = ((KeySearch) innermostContextOnThisSegment).inputKey;
+            if (Objects.equals(key, ((KeySearch) (Object) this).inputKey)) {
+                throw new IllegalStateException("Nested same-thread contexts cannot access " +
+                        "the same key " + key);
+            }
+        }
+    }
+
     @Stage("Locks")
     private void unlinkFromSegmentContextsChain() {
         LocksInterface prevContext = rootContextOnThisSegment;
diff --git a/src/main/java/net/openhft/chronicle/hash/impl/stage/iter/IterationSegmentStages.java b/src/main/java/net/openhft/chronicle/hash/impl/stage/iter/IterationSegmentStages.java
index cf609d680..5313334be 100644
--- a/src/main/java/net/openhft/chronicle/hash/impl/stage/iter/IterationSegmentStages.java
+++ b/src/main/java/net/openhft/chronicle/hash/impl/stage/iter/IterationSegmentStages.java
@@ -17,6 +17,7 @@
 package net.openhft.chronicle.hash.impl.stage.iter;
 
 import net.openhft.chronicle.hash.impl.VanillaChronicleHashHolder;
+import net.openhft.chronicle.hash.impl.stage.entry.LocksInterface;
 import net.openhft.chronicle.hash.impl.stage.entry.SegmentStages;
 import net.openhft.chronicle.hash.impl.stage.entry.HashLookupSearch;
 import net.openhft.chronicle.hash.impl.stage.query.KeySearch;
@@ -48,4 +49,10 @@ public abstract class IterationSegmentStages extends SegmentStages {
         segmentTier = tier;
         segmentBaseAddr = tierBaseAddr;
     }
+
+    @Override
+    public void checkNestedContextsQueryDifferentKeys(
+            LocksInterface innermostContextOnThisSegment) {
+        // this check is relevant only for query contexts
+    }
 }
diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3VoidValueTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3VoidValueTest.java
index 7ee848696..c9dfa92e2 100755
--- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3VoidValueTest.java
+++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3VoidValueTest.java
@@ -101,7 +101,7 @@ public class TCPSocketReplication3VoidValueTest {
         map2.put(5, DUMMY_VALUE);
 
         // allow time for the recompilation to resolve
-        assertTrue(waitTillEqual(5000));
+        waitTillEqual(5000);
 
         assertEquals(map3, map3);
         assertTrue(!map1.isEmpty());