diff --git a/userraw/maps/mp/bots/_bot_internal.gsc b/userraw/maps/mp/bots/_bot_internal.gsc
index 702eb5b..f87075f 100644
--- a/userraw/maps/mp/bots/_bot_internal.gsc
+++ b/userraw/maps/mp/bots/_bot_internal.gsc
@@ -2204,7 +2204,10 @@ killWalkOnEvents()
 	self endon("disconnect");
 	self endon("death");
 	
-	self waittill_any("flash_rumble_loop", "new_enemy", "new_goal_internal", "goal_internal", "bad_path_internal");
+	ret = self waittill_any_return("flash_rumble_loop", "new_enemy", "new_goal_internal", "goal_internal", "bad_path_internal");
+
+	if (ret == "goal_internal")
+		waittillframeend;
 	
 	self notify("kill_goal");
 }
@@ -2214,7 +2217,7 @@ doWalkScriptNotify()
 	self endon("disconnect");
 	self endon("death");
 	
-	ret = self waittill_any_return("kill_goal", "goal_internal", "bad_path_internal");
+	ret = self waittill_any_return("goal_internal", "kill_goal", "bad_path_internal");
 	
 	if (ret == "goal_internal")
 		self notify("goal");
diff --git a/userraw/maps/mp/bots/_bot_script.gsc b/userraw/maps/mp/bots/_bot_script.gsc
index 7dade58..4d3d9b8 100644
--- a/userraw/maps/mp/bots/_bot_script.gsc
+++ b/userraw/maps/mp/bots/_bot_script.gsc
@@ -2379,7 +2379,7 @@ bot_dom_spawn_kill_think()
 		
 		self thread bot_dom_watch_flags(myFlagCount, myTeam);
 
-		if (self waittill_any_return( "goal", "bad_path". "new_goal" ) != "new_goal")
+		if (self waittill_any_return( "goal", "bad_path", "new_goal" ) != "new_goal")
 			self ClearScriptGoal();
 	}
 }