From a3c96847144390d6a485ff05a23924eaddefce1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= <vsc@dcc.fc.up.pt>
Date: Tue, 5 Nov 2013 22:29:28 +0000
Subject: [PATCH] perform true goal expansion from top level goals

---
 pl/boot.yap | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pl/boot.yap b/pl/boot.yap
index 5fe46cce4..73608cd74 100755
--- a/pl/boot.yap
+++ b/pl/boot.yap
@@ -1239,7 +1239,7 @@ catch_ball(C, C).
 
 '$execute_outside_system_mode'(V,M,_) :-
 	var(V), !,
-	call(M:G).
+	call(M:V).
 '$execute_outside_system_mode'(M:G, _M, CP) :- !,
 	'$execute_outside_system_mode'(G, M, CP).
 '$execute_outside_system_mode'((G1,G2), M, CP) :- !,
@@ -1268,7 +1268,7 @@ catch_ball(C, C).
 	(
 	 '$$save_by'(CP1),
 	 '$exit_system_mode',
-	 '$execute_nonstop'(G,M),
+	 '$call'(G, CP, M:G, M),
 	 '$$save_by'(CP2),
 	 (CP1 == CP2 -> ! ; ( true ; '$exit_system_mode', fail ) ),
 	 '$enter_system_mode'