diff --git a/main_shared/maps/mp/bots/_bot_script.gsc b/main_shared/maps/mp/bots/_bot_script.gsc
index 20705a7..861b14f 100644
--- a/main_shared/maps/mp/bots/_bot_script.gsc
+++ b/main_shared/maps/mp/bots/_bot_script.gsc
@@ -1333,11 +1333,11 @@ changeToWeapon(weap)
 	if (!self HasWeapon(weap))
 		return false;
 
+	self BotChangeToWeapon(weap);
+
 	if (self GetCurrentWeapon() == weap)
 		return true;
 
-	self BotChangeToWeapon(weap);
-
 	self waittill_any_timeout(5, "weapon_change");
 
 	return (self GetCurrentWeapon() == weap);
@@ -2210,9 +2210,9 @@ doReloadCancel_loop()
 
 	// do the cancel
 	wait 0.1;
-	self BotChangeToWeapon(weap);
+	self thread ChangeToWeapon(weap);
 	wait 0.25;
-	self BotChangeToWeapon(curWeap);
+	self thread ChangeToWeapon(curWeap);
 	wait 2;
 }
 
@@ -2346,7 +2346,7 @@ bot_watch_think_mw2_loop()
 	if (randomInt(100) > chance)
 		return;
 
-	self ChangeToWeapon(tube);
+	self thread ChangeToWeapon(tube);
 }
 
 /*