diff --git a/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java b/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
index 265c9a2e3..c7dbdf23e 100644
--- a/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
+++ b/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
@@ -1139,7 +1139,13 @@ class ConcurrentExpiryMap<K extends BytesMarshallable, V extends BytesMarshallab
     public static InetAddress getDefaultAddress() throws SocketException {
         NetworkInterface networkInterface = ConcurrentExpiryMap.defaultNetworkInterface();
         Enumeration<InetAddress> inetAddresses = networkInterface.getInetAddresses();
-        InetAddress inetAddress = inetAddresses.nextElement();
+
+        // we will take the last one as this is likely to be an ipv address which is easier to work with
+        InetAddress inetAddress = null;
+        for (; inetAddresses.hasMoreElements(); ) {
+            inetAddress = inetAddresses.nextElement();
+        }
+
 
         if (inetAddress == null)
             throw new IllegalStateException();
diff --git a/src/main/java/net/openhft/chronicle/map/ReplicationHubFindByName.java b/src/main/java/net/openhft/chronicle/map/ReplicationHubFindByName.java
index b7829ba0d..7179b4983 100644
--- a/src/main/java/net/openhft/chronicle/map/ReplicationHubFindByName.java
+++ b/src/main/java/net/openhft/chronicle/map/ReplicationHubFindByName.java
@@ -46,7 +46,7 @@ class ReplicationHubFindByName implements FindByName {
     public ReplicationHubFindByName(ReplicationHub replicationHub) throws IOException {
         this.replicationHub = replicationHub;
         this.map = (Map) of(CharSequence.class, ChronicleMapBuilder.class)
-                .entrySize(300)
+                .entrySize(2500)
                 .entries(128)
                 .instance()
                 .replicatedViaChannel(replicationHub.createChannel((short) MAP_BY_NAME_CHANNEL)).create();
diff --git a/src/test/java/net/openhft/chronicle/map/MapByNameTest.java b/src/test/java/net/openhft/chronicle/map/MapByNameTest.java
index a4dc9dff1..43fd7efdc 100644
--- a/src/test/java/net/openhft/chronicle/map/MapByNameTest.java
+++ b/src/test/java/net/openhft/chronicle/map/MapByNameTest.java
@@ -89,6 +89,7 @@ public class MapByNameTest {
 
     public static void main(String... args) throws IOException, InterruptedException {
         NodeDiscovery nodeDiscovery = new NodeDiscovery();
+/*
 
         ChronicleMapBuilder<CharSequence, CharSequence> builder = ChronicleMapBuilder.of(CharSequence
                 .class, CharSequence.class)
@@ -96,14 +97,13 @@ public class MapByNameTest {
                 .name("myMap")
                 .removeReturnsNull(true);
 
+*/
 
         ReplicationHubFindByName mapByName = nodeDiscovery.mapByName();
-        mapByName.add(builder);
 
 
-        // wait for ever
-        for (; ; ) {
-        }
+        ChronicleMapBuilder myMap = mapByName.get("myMap");
+
 
 
     }