diff --git a/suggester/pom.xml b/suggester/pom.xml
index 0bdd2a04dc9..40608afb8d7 100644
--- a/suggester/pom.xml
+++ b/suggester/pom.xml
@@ -72,7 +72,7 @@
         <dependency>
             <groupId>net.openhft</groupId>
             <artifactId>chronicle-map</artifactId>
-            <version>3.17.1</version>
+            <version>3.17.4</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.sun.java</groupId>
diff --git a/suggester/src/main/java/org/opengrok/suggest/popular/impl/chronicle/BytesRefDataAccess.java b/suggester/src/main/java/org/opengrok/suggest/popular/impl/chronicle/BytesRefDataAccess.java
index 3bc020fbbba..a5c16337399 100644
--- a/suggester/src/main/java/org/opengrok/suggest/popular/impl/chronicle/BytesRefDataAccess.java
+++ b/suggester/src/main/java/org/opengrok/suggest/popular/impl/chronicle/BytesRefDataAccess.java
@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
  */
 package org.opengrok.suggest.popular.impl.chronicle;
 
@@ -50,10 +50,9 @@ public BytesRefDataAccess() {
     }
 
     private void initTransients() {
-        bs = HeapBytesStore.uninitialized();
+        bs = null;
     }
 
-
     @Override
     public RandomDataInput bytes() {
         return bs;
@@ -95,14 +94,14 @@ public Data<BytesRef> getData(@NotNull BytesRef instance) {
             array = new byte[instance.length];
             System.arraycopy(instance.bytes, instance.offset, array, 0, instance.length);
         }
-        bs.init(array);
+        bs = HeapBytesStore.wrap(array);
         return this;
     }
 
     @Override
     public void uninit() {
         array = null;
-        bs.uninit();
+        bs = null;
     }
 
     @Override