diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
index 0b2bfe620..df2f5e776 100644
--- a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
+++ b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
@@ -404,11 +404,11 @@ public class ChronicleMapBuilder<K, V> implements Cloneable,
     private long totalEntriesIfPoorDistribution(int segments) {
         if (segments == 1)
             return entries;
+        double poorDistEntriesScale = Math.log(segments) * entries;
         if (segments <= 8)
-            return entries * 13L / 12L; // 6%, (3% was min for tests)
-        if (segments <= 128)
-            return entries * 8L / 7L; // 14% (7% was min for tests)
-        return entries * 6L / 5L; // 20% (10% was min for tests)
+            return Math.min(entries * segments,
+                    (long) (entries  + poorDistEntriesScale * 0.08 + 64)); // 8% was min for tests
+        return (long) (entries  + poorDistEntriesScale * 0.11 + 80); // 11% was min for tests
     }
 
     @Override
@@ -903,11 +903,11 @@ public class ChronicleMapBuilder<K, V> implements Cloneable,
 
     private VanillaChronicleMap<K, ?, ?, V, ?, ?> newMap() throws IOException {
         preMapConstruction();
-        if (!useReplication()) {
-            return new VanillaChronicleMap<K, Object, MetaBytesInterop<K, Object>,
+        if (useReplication()) {
+            return new ReplicatedChronicleMap<K, Object, MetaBytesInterop<K, Object>,
                     V, Object, MetaBytesWriter<V, Object>>(this);
         } else {
-            return new ReplicatedChronicleMap<K, Object, MetaBytesInterop<K, Object>,
+            return new VanillaChronicleMap<K, Object, MetaBytesInterop<K, Object>,
                     V, Object, MetaBytesWriter<V, Object>>(this);
         }
     }
diff --git a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
index bb73f084a..882ddb49d 100644
--- a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
@@ -556,7 +556,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
             createHashLookups(start);
             start += align64(sizeOfMultiMap() + sizeOfMultiMapBitSet()) * multiMapsPerSegment();
             final NativeBytes bsBytes = new NativeBytes(tmpBytes.objectSerializer(),
-                    start, start + ((entriesPerSegment + 7) / 8), null);
+                    start, start + align8(align8(entriesPerSegment) / 8L), null);
             freeList = new SingleThreadedDirectBitSet(bsBytes);
             start += numberOfBitSets() * sizeOfBitSets();
             entriesOffset = start - bytes.startAddr();
diff --git a/src/test/java/net/openhft/chronicle/map/EntryCountMapTest.java b/src/test/java/net/openhft/chronicle/map/EntryCountMapTest.java
index c73d34b65..c6ca7641d 100644
--- a/src/test/java/net/openhft/chronicle/map/EntryCountMapTest.java
+++ b/src/test/java/net/openhft/chronicle/map/EntryCountMapTest.java
@@ -36,18 +36,24 @@ public class EntryCountMapTest {
     public void testVerySmall() throws Exception {
         int s = 1, i = 1;
         // regression test.
-        testEntriesMaxSize(s, 1, 64, i);
-        testEntriesMaxSize(s, 2, 64, i);
-        testEntriesMaxSize(s, 4, 64, i);
-        testEntriesMaxSize(s, 8, 64, i);
-        testEntriesMaxSize(s, 16, 64, i);
+        testEntriesMaxSize(s, 1, 1, i);
+        testEntriesMaxSize(s, 2, 2, i);
+        testEntriesMaxSize(s, 4, 4, i);
+        testEntriesMaxSize(s, 8, 8, i);
+        testEntriesMaxSize(s, 16, 16, i);
+        testEntriesMaxSize(s, 32, 32, i);
+        testEntriesMaxSize(s, 64, 64, i);
+        s = 2;
+        testEntriesMaxSize(s, 4, 8, i);
+        testEntriesMaxSize(s, 8, 16, i);
+        testEntriesMaxSize(s, 16, 32, i);
         testEntriesMaxSize(s, 32, 64, i);
         testEntriesMaxSize(s, 64, 128, i);
     }
 
     @Test
     public void testSmall() throws Exception {
-        for (int i = 0; i < 2; i++) {
+        for (int i = 0; i < 60; i++) {
             // regression test.
             for (int s : new int[]{1, 2, 4, 8}) {
                 if (s <= 4)
@@ -56,11 +62,11 @@ public class EntryCountMapTest {
                 testEntriesMaxSize(s, 512, 1010, i);
                 testEntriesMaxSize(s, 1000, 1730, i);
                 testEntriesMaxSize(s, 2000, 2800, i);
-                testEntriesMaxSize(s, 4000, 5100, i);
+                testEntriesMaxSize(s, 4000, 5300, i);
                 testEntriesMaxSize(s, 5000, 6800, i);
-                testEntriesMaxSize(s, 8000, 9800, i);
-                testEntriesMaxSize(s, 12000, 15000, i);
-                testEntriesMaxSize(s, 16000, 20000, i);
+                testEntriesMaxSize(s, 8000, 10600, i);
+                testEntriesMaxSize(s, 12000, 16000, i);
+                testEntriesMaxSize(s, 16000, 21000, i);
             }
         }
         // hyperbolic average gives more weight to small numbers.
@@ -69,7 +75,7 @@ public class EntryCountMapTest {
 
     @Test
     public void testMedium() throws Exception {
-        for (int i = 0; i < 1; i++) {
+        for (int i = 0; i < 10; i++) {
             // regression test.
             int s = 16;
             testEntriesMaxSize(s, 512, 1000, i);
@@ -78,32 +84,32 @@ public class EntryCountMapTest {
             testEntriesMaxSize(s, 4000, 5100, i);
             testEntriesMaxSize(s, 5000, 7100, i);
             testEntriesMaxSize(s, 8000, 10100, i);
-            testEntriesMaxSize(s, 12000, 15100, i);
-            testEntriesMaxSize(s, 16000, 20200, i);
+            testEntriesMaxSize(s, 12000, 16000, i);
+            testEntriesMaxSize(s, 16000, 21000, i);
             s = 32;
             testEntriesMaxSize(s, 2000, 3900, i);
             testEntriesMaxSize(s, 4000, 5900, i);
             testEntriesMaxSize(s, 5000, 7900, i);
             testEntriesMaxSize(s, 8000, 12000, i);
             testEntriesMaxSize(s, 12000, 15900, i);
-            testEntriesMaxSize(s, 16000, 20100, i);
-            testEntriesMaxSize(s, 32000, 41000, i);
+            testEntriesMaxSize(s, 16000, 21000, i);
+            testEntriesMaxSize(s, 32000, 42000, i);
             s = 64;
             testEntriesMaxSize(s, 5000, 7550, i);
             testEntriesMaxSize(s, 8000, 11400, i);
-            testEntriesMaxSize(s, 12000, 15400, i);
-            testEntriesMaxSize(s, 16000, 20000, i);
-            testEntriesMaxSize(s, 32000, 39400, i);
-            testEntriesMaxSize(s, 40000, 52200, i);
+            testEntriesMaxSize(s, 12000, 16000, i);
+            testEntriesMaxSize(s, 16000, 22000, i);
+            testEntriesMaxSize(s, 32000, 43000, i);
+            testEntriesMaxSize(s, 40000, 54000, i);
             s = 128;
             testEntriesMaxSize(s, 16000, 23000, i);
-            testEntriesMaxSize(s, 32000, 39000, i);
+            testEntriesMaxSize(s, 32000, 43000, i);
             testEntriesMaxSize(s, 40000, 55200, i);
-            testEntriesMaxSize(s, 64000, 79800, i);
-            testEntriesMaxSize(s, 129000, 160000, i);
+            testEntriesMaxSize(s, 64000, 90000, i);
+            testEntriesMaxSize(s, 129000, 190000, i);
             s = 256;
-            testEntriesMaxSize(s, 64000, 79800, i);
-            testEntriesMaxSize(s, 129000, 160000, i);
+            testEntriesMaxSize(s, 64000, 90000, i);
+            testEntriesMaxSize(s, 129000, 190000, i);
         }
         // hyperbolic average gives more weight to small numbers.
         System.out.printf("Score: %.2f%n", scoreCount / score);