diff --git a/cyclone.scm b/cyclone.scm
index 6c0d3259..984a3b22 100644
--- a/cyclone.scm
+++ b/cyclone.scm
@@ -113,7 +113,12 @@
       (macro:load-env! *defined-macros* (create-environment '() '()))
 
       ;; Expand macros
-      (set! input-program (expand input-program (macro:get-env)))
+      (set! input-program 
+        ((if program? 
+             expand-lambda-body
+             expand)
+         input-program 
+         (macro:get-env)))
       (trace:info "---------------- after macro expansion:")
       (trace:info input-program) ;pretty-print