diff --git a/src/main/java/net/openhft/chronicle/hash/ChronicleHashBuilder.java b/src/main/java/net/openhft/chronicle/hash/ChronicleHashBuilder.java
index 819b40600..1cf48903c 100755
--- a/src/main/java/net/openhft/chronicle/hash/ChronicleHashBuilder.java
+++ b/src/main/java/net/openhft/chronicle/hash/ChronicleHashBuilder.java
@@ -758,8 +758,9 @@ public interface ChronicleHashBuilder<K, H extends ChronicleHash<K, ?, ?, ?>,
      *
      * @param preShutdownAction action to run before closing the {@link ChronicleHash} in a
      *                          JVM shutdown hook.
+     * @return this builder back
      */
-    void setPreShutdownAction(Runnable preShutdownAction);
+    B setPreShutdownAction(Runnable preShutdownAction);
 
     /**
      * @deprecated don't use private API in the client code
diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
index dbcbf8172..b74200b0c 100755
--- a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
+++ b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
@@ -1591,8 +1591,9 @@ public final class ChronicleMapBuilder<K, V> implements
     }
 
     @Override
-    public void setPreShutdownAction(Runnable preShutdownAction) {
+    public ChronicleMapBuilder<K, V> setPreShutdownAction(Runnable preShutdownAction) {
         this.preShutdownAction = preShutdownAction;
+        return this;
     }
 
     @Override
diff --git a/src/main/java/net/openhft/chronicle/set/ChronicleSetBuilder.java b/src/main/java/net/openhft/chronicle/set/ChronicleSetBuilder.java
index 104f347cc..fc038ef49 100755
--- a/src/main/java/net/openhft/chronicle/set/ChronicleSetBuilder.java
+++ b/src/main/java/net/openhft/chronicle/set/ChronicleSetBuilder.java
@@ -353,8 +353,9 @@ public final class ChronicleSetBuilder<K>
     }
 
     @Override
-    public void setPreShutdownAction(Runnable preShutdownAction) {
+    public ChronicleSetBuilder<K> setPreShutdownAction(Runnable preShutdownAction) {
         chronicleMapBuilder.setPreShutdownAction(preShutdownAction);
+        return this;
     }
 
     /**