diff --git a/pom.xml b/pom.xml
index 6cbd0908d..08195f1b1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 
     <artifactId>chronicle-map</artifactId>
 
-    <version>3.20.62-SNAPSHOT</version>
+    <version>3.20.80-SNAPSHOT</version>
     <name>OpenHFT/Chronicle-Map</name>
     <description>Chronicle-Map</description>
     <packaging>bundle</packaging>
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 b7c36137e..7a732011a 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,13 +659,14 @@ public abstract class SegmentStages implements SegmentLock, LocksInterface {
 
     @Stage("Segment")
     public Bytes segmentBytesForRead() {
-        segmentBytes.readLimitToCapacity();
+        segmentBytes.readLimit(segmentBS.capacity());
         return segmentBytes;
     }
 
     @Stage("Segment")
     public Bytes segmentBytesForWrite() {
-        segmentBytes.readPosition(0);
+        segmentBytes.readPosition(0)
+                .readLimit(segmentBS.capacity());
         return segmentBytes;
     }