diff --git a/src/control_backend/agents/bdi/agentspeak_generator.py b/src/control_backend/agents/bdi/agentspeak_generator.py
index d02888a..22b0b8e 100644
--- a/src/control_backend/agents/bdi/agentspeak_generator.py
+++ b/src/control_backend/agents/bdi/agentspeak_generator.py
@@ -172,8 +172,9 @@ class AgentSpeakGenerator:
         )
 
         context = [from_phase_ast]
-        if from_phase and from_phase.goals:
-            context.append(self._astify(from_phase.goals[-1], achieved=True))
+        if from_phase:
+            for goal in from_phase.goals:
+                context.append(self._astify(goal, achieved=True))
 
         body = [
             AstStatement(StatementType.REMOVE_BELIEF, from_phase_ast),