diff --git a/scheme/cyclone/cgen.sld b/scheme/cyclone/cgen.sld
index 57d74096..4f2e0632 100644
--- a/scheme/cyclone/cgen.sld
+++ b/scheme/cyclone/cgen.sld
@@ -1537,11 +1537,12 @@
                            (c-code 
                              ;; Only trace when entering initial defined function
                              (cond
-                               (has-closure? "")
+                               (has-closure?
+                                (if has-loop? "\n while(1) {\n" "")
+                               )
                                (else
                                  (string-append
                                    (st:->code trace)
-                                   TODO: does not work for calls-self, need to invoke that elsewhere...
                                    (if has-loop? "\n while(1) {\n" "")
                                  ))))
                            body)