diff --git a/C/cdmgr.c b/C/cdmgr.c
index 0dcf040cb..c3a556d15 100644
--- a/C/cdmgr.c
+++ b/C/cdmgr.c
@@ -2154,6 +2154,7 @@ p_pred_for_code(void) {
   Int cl;
 
   cl = PredForCode(codeptr, &at, &arity, &module);
+  if (cl == 0) return(unify(ARG5,MkIntegerTerm(cl)));
   return(unify(ARG2,MkAtomTerm(at)) &&
 	 unify(ARG3,MkIntegerTerm(arity)) &&
 	 unify(ARG4,ModuleName[module]) &&
diff --git a/C/tracer.c b/C/tracer.c
index 33bf52b24..c3a3267d5 100644
--- a/C/tracer.c
+++ b/C/tracer.c
@@ -113,9 +113,9 @@ low_level_trace(yap_low_level_port port, PredEntry *pred, CELL *args)
 
   vsc_count++;
   /*  if (vsc_count < 123808900) return; */
-  if (vsc_count == 59) {
+  /* if (vsc_count == 59) {
     printf("Here I go\n");
-  }
+    } */
   /* if (vsc_count > 500000) exit(0); */
   /* if (gc_calls < 1) return;*/
 #if defined(__GNUC__)