diff --git a/src/prolog/lib/builtins.pl b/src/prolog/lib/builtins.pl
index 418914fb..bb0bdb72 100644
--- a/src/prolog/lib/builtins.pl
+++ b/src/prolog/lib/builtins.pl
@@ -226,11 +226,11 @@ writeq(Term) :- write_term(Term, [quoted(true), numbervars(true)]).
 
 % expand_goal.
 
-expand_goal(Term0, Term) :- '$expand_goal'(Term0, Term), !.
+expand_goal(Term0, Term) :- '$expand_goal'(Term0, Term).
 
 % expand_term.
 
-expand_term(Term0, Term) :- '$expand_term'(Term0, Term), !.
+expand_term(Term0, Term) :- '$expand_term'(Term0, Term).
 
 % term_variables.
 
diff --git a/src/prolog/machine/system_calls.rs b/src/prolog/machine/system_calls.rs
index b0282df9..a4fab360 100644
--- a/src/prolog/machine/system_calls.rs
+++ b/src/prolog/machine/system_calls.rs
@@ -205,11 +205,11 @@ impl MachineState {
             },
             &SystemClauseType::ExpandGoal => {
                 self.p = CodePtr::Local(LocalCodePtr::UserGoalExpansion(0));
-//                return Ok(());
+                return Ok(());
             },
             &SystemClauseType::ExpandTerm => {
                 self.p = CodePtr::Local(LocalCodePtr::UserTermExpansion(0));
-//                return Ok(());
+                return Ok(());
             },
             &SystemClauseType::GetDoubleQuotes => {
                 let a1 = self[temp_v!(1)].clone();