diff --git a/src/main/java/net/openhft/chronicle/map/VanillaContext.java b/src/main/java/net/openhft/chronicle/map/VanillaContext.java
index eada44bd0..f2976e8bd 100644
--- a/src/main/java/net/openhft/chronicle/map/VanillaContext.java
+++ b/src/main/java/net/openhft/chronicle/map/VanillaContext.java
@@ -180,11 +180,14 @@ class VanillaContext<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
     }
 
     void closeMapDependants() {
-        // TODO update dependents
+        // TODO update dependants
         closeMapAndContextLocals();
         closeSegmentHeader();
         closeKeyModel();
         closeValueModel();
+        closeKey();
+        closeValue();
+        closeKeyReader();
         closeValueReader();
         closeSegmentIndex();
         closeLocks();