diff --git a/pom.xml b/pom.xml
index 891685714..7dc69d295 100755
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
         <dependency>
             <groupId>net.openhft</groupId>
             <artifactId>zero-allocation-hashing</artifactId>
-            <version>0.2</version>
+            <version>0.4</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/src/main/java/net/openhft/chronicle/hash/Data.java b/src/main/java/net/openhft/chronicle/hash/Data.java
index 78065f47d..5da863f50 100644
--- a/src/main/java/net/openhft/chronicle/hash/Data.java
+++ b/src/main/java/net/openhft/chronicle/hash/Data.java
@@ -138,7 +138,7 @@ public interface Data<V> {
      * <i>bytes</i> representation.
      */
     default int dataHashCode() {
-        return (int) hash(LongHashFunction.city_1_1());
+        return (int) hash(LongHashFunction.xx_r39());
     }
 
     /**
diff --git a/src/main/java/net/openhft/chronicle/hash/impl/stage/entry/InputKeyHashCode.java b/src/main/java/net/openhft/chronicle/hash/impl/stage/entry/InputKeyHashCode.java
index 3eff5343f..c60fa61fc 100644
--- a/src/main/java/net/openhft/chronicle/hash/impl/stage/entry/InputKeyHashCode.java
+++ b/src/main/java/net/openhft/chronicle/hash/impl/stage/entry/InputKeyHashCode.java
@@ -29,7 +29,7 @@ public class InputKeyHashCode implements KeyHashCode {
     public long keyHash = 0;
 
     void initKeyHash() {
-        keyHash = ks.inputKey.hash(LongHashFunction.city_1_1());
+        keyHash = ks.inputKey.hash(LongHashFunction.xx_r39());
     }
 
     @Override
diff --git a/src/main/java/net/openhft/chronicle/hash/impl/stage/iter/IterationKeyHashCode.java b/src/main/java/net/openhft/chronicle/hash/impl/stage/iter/IterationKeyHashCode.java
index 7e67ac222..a0a76de49 100644
--- a/src/main/java/net/openhft/chronicle/hash/impl/stage/iter/IterationKeyHashCode.java
+++ b/src/main/java/net/openhft/chronicle/hash/impl/stage/iter/IterationKeyHashCode.java
@@ -34,7 +34,7 @@ public class IterationKeyHashCode implements KeyHashCode {
     void initKeyHash() {
         long addr = s.tierBaseAddr + e.keyOffset;
         long len = e.keySize;
-        keyHash = LongHashFunction.city_1_1().hashMemory(addr, len);
+        keyHash = LongHashFunction.xx_r39().hashMemory(addr, len);
     }
 
     @Override
diff --git a/src/test/java/net/openhft/chronicle/map/KeySegmentDistributionTest.java b/src/test/java/net/openhft/chronicle/map/KeySegmentDistributionTest.java
index 422a14885..257900579 100644
--- a/src/test/java/net/openhft/chronicle/map/KeySegmentDistributionTest.java
+++ b/src/test/java/net/openhft/chronicle/map/KeySegmentDistributionTest.java
@@ -56,7 +56,7 @@ public class KeySegmentDistributionTest {
         for (int i = 0; i < size; i++) {
             random.nextBytes(keyBytes);
             String key = new String(keyBytes, StandardCharsets.US_ASCII);
-            long hash = LongHashFunction.city_1_1().hashBytes(StandardCharsets.UTF_8.encode(key));
+            long hash = LongHashFunction.xx_r39().hashBytes(StandardCharsets.UTF_8.encode(key));
             int segmentIndex = (((int) hash) & Integer.MAX_VALUE) % segments;
             // Put the segment index as a value to the map
             map.put(key, segmentIndex);