diff --git a/userraw/maps/mp/bots/_bot_script.gsc b/userraw/maps/mp/bots/_bot_script.gsc
index b701790..f28d17f 100644
--- a/userraw/maps/mp/bots/_bot_script.gsc
+++ b/userraw/maps/mp/bots/_bot_script.gsc
@@ -4153,7 +4153,7 @@ bot_hq()
 			if (event != "new_goal")
 				self ClearScriptGoal();
 				
-			if (event == "bad_path")
+			if (event != "goal")
 			{
 				self.bot_lock_goal = false;
 				continue;
@@ -4538,7 +4538,7 @@ bot_sab()
 				continue;
 		
 			self.bot_lock_goal = true;
-			self SetScriptGoal( origin, 64 );
+			self SetScriptGoal( origin, 1 );
 
 			self thread bot_go_plant(site);
 			event = self waittill_any_return( "goal", "bad_path", "new_goal" );
@@ -4546,7 +4546,7 @@ bot_sab()
 			if (event != "new_goal")
 				self ClearScriptGoal();
 
-			if(event == "bad_path" || level.bombPlanted || !self isTouching(site.trigger) || site IsInUse() || self inLastStand() || self HasThreat())
+			if(event != "goal" || level.bombPlanted || !self isTouching(site.trigger) || site IsInUse() || self inLastStand() || self HasThreat())
 			{
 				self.bot_lock_goal = false;
 				continue;
@@ -4648,13 +4648,14 @@ bot_sab()
 			// lets go defuse
 			self.bot_lock_goal = true;
 			self thread bot_inc_bots(site);
+			self SetScriptGoal( origin, 1 );
 
 			event = self waittill_any_return( "goal", "bad_path", "new_goal" );
 
 			if (event != "new_goal")
 				self ClearScriptGoal();
 
-			if(event == "bad_path" || !level.bombPlanted || site IsInUse() || !self isTouching(site.trigger) || self InLastStand() || self HasThreat())
+			if(event != "goal" || !level.bombPlanted || site IsInUse() || !self isTouching(site.trigger) || self InLastStand() || self HasThreat())
 			{
 				self.bot_lock_goal = false;
 				continue;
diff --git a/z_bots.bat b/z_bots.bat
index 4cd4b74..24047c6 100644
--- a/z_bots.bat
+++ b/z_bots.bat
@@ -1 +1 @@
-start "" "%~dp0iw4x.exe" -nosteam -scriptablehttp -console +set r_fullscreen "0" +set sv_lanonly "1" +set r_mode "1024x768" +set drawlagometer "1" +set cg_drawfps "4" +set fs_game "" +set bots_manage_fill "4" +set cg_drawsnapshot "1" +set ui_mapname "mp_rust" +set scr_game_spectatetype "2" +set scr_war_scorelimit "0" +set thereisacow "1" +set sv_cheats "1" +set there +map mp_rust
\ No newline at end of file
+start "" "%~dp0iw4x.exe" -nosteam -scriptablehttp -console +set r_fullscreen "0" +set sv_lanonly "1" +set r_mode "1024x768" +set drawlagometer "1" +set cg_drawfps "4" +set fs_game "" +set bots_manage_fill "4" +set cg_drawsnapshot "1" +set ui_mapname "mp_rust" +set scr_game_spectatetype "2" +set scr_war_scorelimit "0" +set thereisacow "1" +set sv_cheats "1" +map mp_rust
\ No newline at end of file