diff --git a/src/day8/re_frame/trace.cljs b/src/day8/re_frame/trace.cljs
index 90bc863..94ca97a 100644
--- a/src/day8/re_frame/trace.cljs
+++ b/src/day8/re_frame/trace.cljs
@@ -21,8 +21,27 @@
             [devtools.formatters.core :as devtools]))
 
 
+;; from https://github.com/reagent-project/reagent/blob/3fd0f1b1d8f43dbf169d136f0f905030d7e093bd/src/reagent/impl/component.cljs#L274
+(defn fiber-component-path [fiber]
+  (let [name (some-> fiber
+                     ($ :type)
+                     ($ :displayName))
+        parent (some-> fiber
+                       ($ :return))
+        path (some-> parent
+                     fiber-component-path
+                     (str " > "))
+        res (str path name)]
+    (when-not (empty? res) res)))
+
+(defn component-path [c]
+  ;; Alternative branch for React 16
+  (if-let [fiber (some-> c ($ :_reactInternalFiber))]
+    (fiber-component-path fiber)
+    (component/component-path c)))
+
 (defn comp-name [c]
-  (let [n (or (component/component-path c)
+  (let [n (or (component-path c)
               (some-> c .-constructor util/fun-name))]
     (if-not (empty? n)
       n
@@ -33,8 +52,8 @@
    (fn render []
      (this-as c
        (trace/with-trace {:op-type   :render
-                          :tags      {:component-path (reagent.impl.component/component-path c)}
-                          :operation (last (str/split (reagent.impl.component/component-path c) #" > "))}
+                          :tags      {:component-path (component-path c)}
+                          :operation (last (str/split (component-path c) #" > "))}
                          (if util/*non-reactive*
                            (reagent.impl.component/do-render c)
                            (let [rat        ($ c :cljsRatom)
@@ -63,7 +82,7 @@
               (let [name (comp-name c)]
                 (js/console.log c)
                 (trace/with-trace {:op-type   :render
-                                   :tags      {:component-path (reagent.impl.component/component-path c)}
+                                   :tags      {:component-path (component-path c)}
                                    :operation (last (str/split name #" > "))}
                                   (real-renderer c)))))
 
@@ -78,7 +97,7 @@
               (fn [] (this-as c
                        (trace/with-trace {:op-type   key
                                           :operation (last (str/split (comp-name c) #" > "))
-                                          :tags      {:component-path (reagent.impl.component/component-path c)
+                                          :tags      {:component-path (component-path c)
                                                       :reaction       (interop/reagent-id ($ c :cljsRatom))}})
                        (.call (real-custom-wrapper key f) c c)))