diff --git a/C/absmi.c b/C/absmi.c
index ce03cc4e8..5e379c5ee 100644
--- a/C/absmi.c
+++ b/C/absmi.c
@@ -2159,18 +2159,9 @@ Yap_absmi(int inp)
       /* also, this is unusual in that I have already done deallocate,
 	 so I don't need to redo it.
        */ 
-    NoStackProceed:
+    NoStackDeallocate:
       if (CFREG == (CELL)(LCL0+2)) {
-	/*
-	  we're not actually doing debugging here, just execute
-	  instruction and go on.
-	*/
-	PREG = CPREG;
-	YREG = ENV;
-#ifdef DEPTH_LIMIT
-	DEPTH = YREG[E_DEPTH];
-#endif
-	JMPNext();
+	GONext();
       }
       ASP = YREG;
       if (CFREG == (CELL)(LCL0+1)) {
@@ -2178,7 +2169,13 @@ Yap_absmi(int inp)
       }
       if (CFREG == Unsigned(LCL0)) {
 	if (Yap_ReadTimedVar(WokenGoals) != TermNil) {
-	  SREG = (CELL *)RepPredProp(Yap_GetPredPropByAtom(AtomTrue,0));
+	  if (Yap_op_from_opcode(PREG->opc) == _cut_e) {
+	    /* followed by a cut */
+	    ARG1 = MkIntegerTerm(LCL0-(CELL *)SREG[E_CB]);
+	    SREG = (CELL *)RepPredProp(Yap_GetPredPropByFunc(FunctorCutBy,1));
+	  } else {
+	    SREG = (CELL *)RepPredProp(Yap_GetPredPropByAtom(AtomTrue,0));
+	  }
 	  goto creep;
 	} else {
 	  CFREG = CalculateStackGap();
@@ -2567,10 +2564,6 @@ Yap_absmi(int inp)
 
       BOp(procceed, e);
       CACHE_Y_AS_ENV(YREG);
-#ifndef NO_CHECKING
-      /* check stacks */
-      check_stack(NoStackProceed, H);
-#endif
       PREG = CPREG;
       E_YREG = ENV;
 #ifdef DEPTH_LIMIT
@@ -2622,6 +2615,10 @@ Yap_absmi(int inp)
 	E_YREG = (CELL *) ((CELL) E_YREG + ENV_Size(CPREG));
 #endif /* FROZEN_STACKS */
       WRITEBACK_Y_AS_ENV();
+#ifndef NO_CHECKING
+      /* check stacks */
+      check_stack(NoStackDeallocate, H);
+#endif
       ENDCACHE_Y_AS_ENV();
       GONext();
       ENDOp();
diff --git a/C/cdmgr.c b/C/cdmgr.c
index b97c20fc5..3b8d3e44f 100644
--- a/C/cdmgr.c
+++ b/C/cdmgr.c
@@ -577,20 +577,22 @@ retract_all(PredEntry *p, int in_use)
     p->StatisticsForPred.NOfHeadSuccesses = 0;
     p->StatisticsForPred.NOfRetries = 0;
   } else {
-    yamop *cpt = (yamop *)fclause;
-    cpt->opc = Yap_opcode(TRYCODE(_try_me, _try_me0, PredArity(p)));
-    if (fclause == lclause) {
-      p->cs.p_code.TrueCodeOfPred = p->CodeOfPred = NEXTOP(cpt,ld);
-      p->OpcodeOfPred = NEXTOP(cpt,ld)->opc;
-    } else {
-      p->cs.p_code.TrueCodeOfPred = p->CodeOfPred = fclause;
-      p->OpcodeOfPred = cpt->opc;
-      if (p->PredFlags & ProfiledPredFlag) {
-	((yamop *)lclause)->opc = Yap_opcode(_profiled_trust_me);
-      } else if (p->PredFlags & CountPredFlag) {
-	((yamop *)lclause)->opc = Yap_opcode(_count_trust_me);
+    if (!(p->PredFlags & LogUpdatePredFlag)) {
+      yamop *cpt = (yamop *)fclause;
+      cpt->opc = Yap_opcode(TRYCODE(_try_me, _try_me0, PredArity(p)));
+      if (fclause == lclause) {
+	p->cs.p_code.TrueCodeOfPred = p->CodeOfPred = NEXTOP(cpt,ld);
+	p->OpcodeOfPred = NEXTOP(cpt,ld)->opc;
       } else {
-	((yamop *)lclause)->opc = Yap_opcode(TRYCODE(_trust_me, _trust_me0, PredArity(p)));
+	p->cs.p_code.TrueCodeOfPred = p->CodeOfPred = fclause;
+	p->OpcodeOfPred = cpt->opc;
+	if (p->PredFlags & ProfiledPredFlag) {
+	  ((yamop *)lclause)->opc = Yap_opcode(_profiled_trust_me);
+	} else if (p->PredFlags & CountPredFlag) {
+	  ((yamop *)lclause)->opc = Yap_opcode(_count_trust_me);
+	} else {
+	  ((yamop *)lclause)->opc = Yap_opcode(TRYCODE(_trust_me, _trust_me0, PredArity(p)));
+	}
       }
     }
     if (p->PredFlags & SpiedPredFlag) {
diff --git a/C/index.c b/C/index.c
index 6762e309d..0d6ca623e 100644
--- a/C/index.c
+++ b/C/index.c
@@ -4119,6 +4119,8 @@ ExpandIndex(PredEntry *ap) {
   yamop **labp;
   int cb;
 
+  extern long long int vsc_count;
+  printf("vsc_count: %lld\n", vsc_count);
   Yap_Error_Size = 0;
   if ((cb = setjmp(Yap_CompilerBotch)) == 3) {
     restore_machine_regs();
diff --git a/pl/boot.yap b/pl/boot.yap
index 16b7229b1..287ff53c7 100644
--- a/pl/boot.yap
+++ b/pl/boot.yap
@@ -461,14 +461,14 @@ repeat :- '$repeat'.
 	(
 		'$start_creep',
 		'$execute'(G),
-		'$stop_creep',
+		'$do_stop_creep',
 		'$extract_goal_vars_for_dump'(V,LIV),
 		'$show_frozen'(G,LIV,LGs),
 		'$write_answer'(V, LGs, Written),
 		'$write_query_answer_true'(Written),
 		'$another',
 		!, fail ;
-		'$stop_creep',
+		'$do_stop_creep',
 		'$present_answer'(_, no),
 		fail
 	).
@@ -476,7 +476,7 @@ repeat :- '$repeat'.
 '$yes_no'(G,C) :-
 	'$current_module'(M),
 	'$do_yes_no'(G,M),
-	'$stop_creep',
+	'$do_stop_creep',
 	'$show_frozen'(G, [], LGs),
 	'$write_answer'([], LGs, Written),
         ( Written = [] ->
@@ -485,10 +485,14 @@ repeat :- '$repeat'.
 	),
 	fail.
 '$yes_no'(_,_) :-
-	'$stop_creep',
+	'$do_stop_creep',
 	'$present_answer'(_, no),
 	fail.
 
+% make sure we have Prolog code to force running any delayed goals.
+'$do_stop_creep' :-
+	'$stop_creep'.
+
 
 '$start_creep' :-
 	( get_value('$trace', 1) ->