diff --git a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
index ec9356a33..1bd4fdfa9 100755
--- a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
@@ -399,7 +399,7 @@ public class VanillaChronicleMap<K, V, R>
 
     public QueryContextInterface<K, V, R> mapContext() {
         //noinspection unchecked
-        return q().getContext(CompiledMapIterationContext.class,
+        return q().getContext(CompiledMapQueryContext.class,
                 // lambda is used instead of constructor reference because currently stage-compiler
                 // has issues with parsing method/constructor refs.
                 // TODO replace with constructor ref when stage-compiler is improved