diff --git a/build.boot b/build.boot
index fc7df3e..867233f 100644
--- a/build.boot
+++ b/build.boot
@@ -1,4 +1,4 @@
-(def +version+ "0.1.15")
+(def +version+ "0.1.16-SNAPSHOT")
 
 (set-env!
   :source-paths #{"src"}
diff --git a/src/mount/core.cljc b/src/mount/core.cljc
index 2c1ac9a..2128f90 100644
--- a/src/mount/core.cljc
+++ b/src/mount/core.cljc
@@ -60,17 +60,6 @@
       (stop))
     (swap! running dissoc state)))
 
-#?(:clj
-    (defn current-state [state]
-      (let [{:keys [inst var]} (@meta-state state)]
-        (if (= @mode :cljc)
-          @inst
-          (var-get var))))
-
-   :cljs
-    (defn current-state [state]
-      (-> (@meta-state state) :inst deref)))
-
 #?(:clj
     (defn alter-state! [{:keys [var inst]} value]
       (if (= @mode :cljc)
@@ -140,6 +129,17 @@
     [_]
     (boolean ((running-states) name))))
 
+#?(:clj
+    (defn current-state [state]
+      (let [{:keys [var]} (@meta-state state)]
+        (if (= @mode :cljc)
+          (->DerefableState state)
+          (var-get var))))
+
+   :cljs
+    (defn current-state [state]
+      (-> (@meta-state state) :inst deref)))
+
 (defn on-reload-meta [s-var]
   (or (-> s-var meta :on-reload)
       :restart))                      ;; restart by default on ns reload