diff --git a/C/utilpreds.c b/C/utilpreds.c
index 4bd55ad9e..1f7140935 100644
--- a/C/utilpreds.c
+++ b/C/utilpreds.c
@@ -2802,6 +2802,9 @@ static Int ground_complex_term(register CELL *pt0, register CELL *pt0_end USES_R
 	*pt0 = TermNil;
 #else
 	if (pt0 < pt0_end) {
+	  if (to_visit+2 >= (struct cp_frame *)AuxSp) {
+	    goto heap_overflow;
+	  }
 	  to_visit[0] = pt0;
 	  to_visit[1] = pt0_end;
 	  to_visit += 2;
@@ -2910,10 +2913,12 @@ int Yap_IsGroundTerm(Term t)
       }
     }
     if (out < 0) {
+      *H++ = t;
       if (!Yap_ExpandPreAllocCodeSpace(0, NULL, TRUE)) {
 	Yap_Error(OUT_OF_AUXSPACE_ERROR, ARG1, "overflow in ground");
 	return FALSE;
       }      
+      t = *--H;
     }
   }
 }