diff --git a/src/main/java/net/openhft/chronicle/map/ChannelProvider.java b/src/main/java/net/openhft/chronicle/map/ChannelProvider.java
index 5d5779a1c..9a3571b0e 100644
--- a/src/main/java/net/openhft/chronicle/map/ChannelProvider.java
+++ b/src/main/java/net/openhft/chronicle/map/ChannelProvider.java
@@ -318,7 +318,10 @@ final class ChannelProvider implements Closeable {
     }
 
     private void add(int chronicleChannel,
-                     Replica replica, EntryExternalizable entryExternalizable) {
+                     Replica replica,
+                     @NotNull EntryExternalizable entryExternalizable) {
+
+        LOG.info("adding chronicleChannel=" + chronicleChannel + ",entryExternalizable=" + entryExternalizable);
         channelDataLock.writeLock().lock();
         try {
             if (chronicleChannels[chronicleChannel] != null) {
@@ -327,7 +330,7 @@ final class ChannelProvider implements Closeable {
             }
             chronicleChannels[chronicleChannel] = replica;
             chronicleChannelList.add(replica);
-            chronicleChannelIds.add((int) chronicleChannel);
+            chronicleChannelIds.add(chronicleChannel);
             channelEntryExternalizables[chronicleChannel] = entryExternalizable;
 
             if (chronicleChannel == 0)
diff --git a/src/test/java/net/openhft/chronicle/map/MapByNameTest.java b/src/test/java/net/openhft/chronicle/map/MapByNameTest.java
index 45c5d0c1d..313b8d1ab 100644
--- a/src/test/java/net/openhft/chronicle/map/MapByNameTest.java
+++ b/src/test/java/net/openhft/chronicle/map/MapByNameTest.java
@@ -97,13 +97,13 @@ public class MapByNameTest {
         ChronicleMapBuilder<CharSequence, CharSequence> builder = ChronicleMapBuilder.of(CharSequence
                 .class, CharSequence.class)
                 .minSegments(2)
-                .name("myMap4")
+                .name("myMap5")
                 .removeReturnsNull(true);
 
-        //    ChronicleMap<String, String> map = mapByName.create(builder);
-        //  map.put("hello", "world");
+           ChronicleMap<String, String> map = mapByName.create(builder);
+         map.put("hello", "world");
 
-        final ChronicleMap<CharSequence, CharSequence> map = mapByName.from("myMap4");
+       // final ChronicleMap<CharSequence, CharSequence> map = mapByName.from("myMap4");
 
 
         // allow time for replication