diff --git a/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java b/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
index dcb5af770..04331cfb0 100644
--- a/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
+++ b/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
@@ -326,7 +326,7 @@ public class NodeDiscovery {
                         "going the grid.");
             }
 
-            if (possible == 128)
+            if (possible == Byte.MAX_VALUE)
                 possible = 0;
             else
                 possible++;
diff --git a/src/test/java/eg/BGChronicleTest.java b/src/test/java/eg/BGChronicleTest.java
index 3265760c6..df831891b 100644
--- a/src/test/java/eg/BGChronicleTest.java
+++ b/src/test/java/eg/BGChronicleTest.java
@@ -32,8 +32,8 @@ public class BGChronicleTest {
 
         return ChronicleMapBuilder.of(byte[].class, byte[].class)
                 .entries(MAX_NUMBER_OF_EATERIES)
-                .keySize(17)
-                .valueSize(11)
+                .constantKeySizeBySample(key)
+                .constantValueSizeBySample(value)
                 .putReturnsNull(true)
                 .removeReturnsNull(true)
                 .replication((byte) 1, serverConfig)
@@ -56,8 +56,8 @@ public class BGChronicleTest {
 
 
         try (ChronicleMap<byte[], byte[]> map = ChronicleMapBuilder.of(byte[].class, byte[].class)
-                .keySize(17)
-                .valueSize(11)
+                .constantKeySizeBySample(key)
+                .constantValueSizeBySample(value)
                 .putReturnsNull(true)
                 .removeReturnsNull(true)
                 .statelessClient(new InetSocketAddress(hostNameOrIpAddress, port)).create()) {