diff --git a/pom.xml b/pom.xml
index 3224ba9ca..9bf7c5612 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
             <dependency>
                 <groupId>net.openhft</groupId>
                 <artifactId>lang</artifactId>
-                <version>6.5-SNAPSHOT</version>
+                <version>6.6-SNAPSHOT</version>
             </dependency>
 
             <dependency>
diff --git a/src/main/java/net/openhft/chronicle/hash/serialization/internal/BasicCopyingMetaBytesInterop.java b/src/main/java/net/openhft/chronicle/hash/serialization/internal/BasicCopyingMetaBytesInterop.java
index d1899f024..61c27335f 100644
--- a/src/main/java/net/openhft/chronicle/hash/serialization/internal/BasicCopyingMetaBytesInterop.java
+++ b/src/main/java/net/openhft/chronicle/hash/serialization/internal/BasicCopyingMetaBytesInterop.java
@@ -65,6 +65,6 @@ public abstract class BasicCopyingMetaBytesInterop<E, W> implements MetaBytesInt
 
     @Override
     public void write(W writer, Bytes bytes, E e) {
-        bytes.write(buffer.buffer);
+        bytes.write(buffer.buffer, buffer.buffer.position(), size);
     }
 }
diff --git a/src/main/java/net/openhft/chronicle/hash/serialization/internal/BytesBytesInterop.java b/src/main/java/net/openhft/chronicle/hash/serialization/internal/BytesBytesInterop.java
index c1abb7c1b..4cdc2a49b 100644
--- a/src/main/java/net/openhft/chronicle/hash/serialization/internal/BytesBytesInterop.java
+++ b/src/main/java/net/openhft/chronicle/hash/serialization/internal/BytesBytesInterop.java
@@ -48,6 +48,6 @@ public enum BytesBytesInterop implements BytesInterop<Bytes> {
 
     @Override
     public void write(@NotNull Bytes bytes, @NotNull Bytes e) {
-        bytes.write(e);
+        bytes.write(e, e.position(), e.remaining());
     }
 }
diff --git a/src/main/java/net/openhft/chronicle/map/ChannelProvider.java b/src/main/java/net/openhft/chronicle/map/ChannelProvider.java
index 8e08abe66..5f9ae55db 100644
--- a/src/main/java/net/openhft/chronicle/map/ChannelProvider.java
+++ b/src/main/java/net/openhft/chronicle/map/ChannelProvider.java
@@ -502,7 +502,7 @@ final class ChannelProvider implements Closeable {
             @Override
             public void writeExternalEntry(@NotNull Bytes entry, @NotNull Bytes destination,
                                            int na) {
-                destination.write(entry);
+                destination.write(entry, entry.position(), entry.remaining());
             }
 
             @Override
diff --git a/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java b/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
index 137bca57d..893f9a4be 100644
--- a/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
+++ b/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
@@ -755,7 +755,7 @@ class DiscoveryNodeBytesMarshallable implements BytesMarshallable {
             return false;
 
         BOOTSTRAP_BYTES.clear();
-        out.write(BOOTSTRAP_BYTES);
+        out.write(BOOTSTRAP_BYTES, BOOTSTRAP_BYTES.position(), BOOTSTRAP_BYTES.remaining());
 
         ourProposedIdentifier.writeMarshallable(out);
         return true;
diff --git a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
index e41181abe..cd5642d1c 100644
--- a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
@@ -808,7 +808,7 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
         // write the key
         entry.position(keyPosition);
         entry.limit(keyLimit);
-        destination.write(entry);
+        destination.write(entry, entry.position(), entry.remaining());
 
         boolean debugEnabled = LOG.isDebugEnabled();
         String message = null;
@@ -833,7 +833,7 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
 
         // writes the value
         entry.limit(entry.position() + valueSize);
-        destination.write(entry);
+        destination.write(entry, entry.position(), entry.remaining());
 
         if (debugEnabled) {
             LOG.debug(message + "value=" + entry.toString().trim() + ")");
diff --git a/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java b/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java
index 9613ba244..96404d9b6 100644
--- a/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java
+++ b/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java
@@ -300,7 +300,7 @@ public class StatelessClientTest {
 
                 serverMap.put("hello", "world");
 
-                statelessMap.replace("hello", "world", "hello");
+                assertTrue(statelessMap.replace("hello", "world", "hello"));
 
                 assertEquals("hello", statelessMap.get("hello"));
                 assertEquals(1, statelessMap.size());