diff --git a/C/save.c b/C/save.c
index eaafd1a9b..30b06ff9e 100755
--- a/C/save.c
+++ b/C/save.c
@@ -1808,8 +1808,8 @@ p_restore(void)
 void 
 Yap_InitSavePreds(void)
 {
-  Yap_InitCPred("$save", 1, p_save, SafePredFlag|SyncPredFlag|HiddenPredFlag);
-  Yap_InitCPred("$save", 2, p_save2, SafePredFlag|SyncPredFlag|HiddenPredFlag);
-  Yap_InitCPred("$save_program", 1, p_save_program, SafePredFlag|SyncPredFlag|HiddenPredFlag);
+  Yap_InitCPred("$save", 1, p_save, SyncPredFlag|HiddenPredFlag);
+  Yap_InitCPred("$save", 2, p_save2, SyncPredFlag|HiddenPredFlag);
+  Yap_InitCPred("$save_program", 1, p_save_program, SyncPredFlag|HiddenPredFlag);
   Yap_InitCPred("$restore", 1, p_restore, SyncPredFlag|HiddenPredFlag);
 }
diff --git a/console/yap.c b/console/yap.c
index cbc2c43b4..e9137f1ab 100644
--- a/console/yap.c
+++ b/console/yap.c
@@ -732,7 +732,7 @@ main (int argc, char **argv)
     exit(1);
   }
   /* Begin preprocessor code */
-  {
+  if (BootMode != YAP_BOOT_FROM_SAVED_STACKS) {
     // load the module
     YAP_Term mod_arg[1];
     mod_arg[0] = YAP_MkAtomTerm(YAP_LookupAtom("ypp"));