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 c6150ec00..b7c36137e 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
@@ -659,7 +659,7 @@ public abstract class SegmentStages implements SegmentLock, LocksInterface {
 
     @Stage("Segment")
     public Bytes segmentBytesForRead() {
-        segmentBytes.readLimit(segmentBytes.capacity());
+        segmentBytes.readLimitToCapacity();
         return segmentBytes;
     }
 
diff --git a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
index 15198548e..dfeee5247 100755
--- a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
@@ -702,7 +702,7 @@ public class VanillaChronicleMap<K, V, R>
             }
 
             long keySizeOffset = entrySpaceOffset + (entryPos * chunkSize);
-            bs.readLimit(bs.capacity());
+            bs.readLimitToCapacity();
             bs.readPosition(keySizeOffset);
             long keySize = keySizeMarshaller.readSize(bs);
             long keyOffset = bs.readPosition();