diff --git a/.gitignore b/.gitignore
index b7e07780e..5afb6d6e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -148,5 +148,5 @@ cmake/cmake-android
 yap-6.3.workspace
 
 YAP.project
-
+sublime
 *.tmp
diff --git a/pl/boot.yap b/pl/boot.yap
index 6f8cbb383..a11d920b8 100644
--- a/pl/boot.yap
+++ b/pl/boot.yap
@@ -171,7 +171,11 @@ list, since backtracking could not "pass through" the cut.
 
 */
 
-system_module(_Mod, _SysExps, _Decls) :- ! .
+system_module(_Mod, _SysExps, _Decls) :- ! ,
+    source_module( prolog ), !.
+system_module(_Mod, _SysExps, _Decls) :-
+	 nb_setval('$if_skip_mode',skip).
+
 %    new_system_module(Mod).
 
 use_system_module(_init, _SysExps) :- !.
@@ -1417,8 +1421,8 @@ bootstrap(F) :-
 	!.
 '$loop'(Stream,Status) :-
  %   start_low_level_trace,
-	'$current_module'( OldModule ),
 	repeat,
+	source_module( OldModule ),
 	'$system_catch'( '$enter_command'(Stream,OldModule,Status),
                      OldModule, Error,
 			         user:'$LoopError'(Error, Status)
diff --git a/pl/consult.yap b/pl/consult.yap
index 1332668fd..d1031f602 100644
--- a/pl/consult.yap
+++ b/pl/consult.yap
@@ -708,7 +708,7 @@ db_files(Fs) :-
 	),
 	'$loop'(Stream,Reconsult),
 	'$lf_opt'(imports, TOpts, Imports),
-	'$import_to_current_module'(File, ContextModule, Imports, _, TOpts),
+	'$import_to_current_module'(File, SourceModule, Imports, _, TOpts),
 	'$current_module'(Mod, SourceModule),
 	H is heapused-H0, '$cputime'(TF,_), T is TF-T0,
 	'$early_print'(Verbosity, loaded(EndMsg, File, Mod, T, H)),