diff --git a/pl/attributes.yap b/pl/attributes.yap
index 84078cac4..c33f99c68 100644
--- a/pl/attributes.yap
+++ b/pl/attributes.yap
@@ -270,7 +270,8 @@ call_residue(Goal,Module,Residue) :-
 
 delayed_goals(G, Vs, NVs, Gs) :-
 	project_delayed_goals(G),
-	copy_term([G|Vs], [_|NVs], Gs).
+	term_factorized([G|Vs], [_|NVs], Gs).
+%	copy_term([G|Vs], [_|NVs], Gs).
 
 project_delayed_goals(G) :-
 % SICStus compatible step,
diff --git a/pl/boot.yap b/pl/boot.yap
index b826f57be..043bfc906 100755
--- a/pl/boot.yap
+++ b/pl/boot.yap
@@ -524,8 +524,9 @@ true :- true.
 	  '$clean_ifcp'(CP),
 	   NCP is NCP2-NCP1
 	  ;
-	   copy_term_nat(V, NV), 
-	   LGs = [], 
+%	   copy_term_nat(V, NV), 
+%	   LGs = [], 
+	   term_factorized(V, NV, LGs),
 	   NCP = 0
         ).