diff --git a/src/cmp/cmpflet.lsp b/src/cmp/cmpflet.lsp
index 1d6798d9a..acaf9cda5 100644
--- a/src/cmp/cmpflet.lsp
+++ b/src/cmp/cmpflet.lsp
@@ -226,9 +226,10 @@
 	   (return nil))
           ((and (fun-p fun) (same-fname-p (fun-name fun) fname))
 	   (incf (fun-ref fun))
-	   (if build-object
-	       (setf (fun-ref-ccb fun) t)
-	       (push fun (fun-referred-funs *current-function*)))
+	   (cond (build-object
+		  (setf (fun-ref-ccb fun) t))
+		 (*current-function*
+		  (push fun (fun-referred-funs *current-function*))))
 	   ;; we introduce a variable to hold the funob
 	   (let ((var (fun-var fun)))
 	     (cond (ccb (when build-object