diff --git a/main_shared/maps/mp/bots/_bot_internal.gsc b/main_shared/maps/mp/bots/_bot_internal.gsc
index cc0453d..fbb91c1 100644
--- a/main_shared/maps/mp/bots/_bot_internal.gsc
+++ b/main_shared/maps/mp/bots/_bot_internal.gsc
@@ -288,11 +288,10 @@ onWeaponChange()
 
 		if (newWeapon == "none")
 		{
-			self changeToWeap(self.lastDroppableWeapon);
 			continue;
 		}
 		
-		self changeToWeap(self GetCurrentWeapon());
+		self changeToWeap(newWeapon);
 	}
 }
 
@@ -1815,14 +1814,5 @@ prone()
 */
 changeToWeap(weap)
 {
-	toks = strtok(weap, "_");
-	if (toks[0] == "gl")
-	{
-		self setSpawnWeapon(weap);
-		//self botWeapon("");
-		return;
-	}
-
-	//self botWeapon(weap);
-	self setSpawnWeapon(weap);
+	self botWeapon(weap);
 }
diff --git a/main_shared/maps/mp/bots/_bot_script.gsc b/main_shared/maps/mp/bots/_bot_script.gsc
index 15b44f6..9ebc0f9 100644
--- a/main_shared/maps/mp/bots/_bot_script.gsc
+++ b/main_shared/maps/mp/bots/_bot_script.gsc
@@ -1007,7 +1007,7 @@ bot_weapon_think()
 			
 			if(threat.classname == "script_vehicle" && self getAmmoCount("rpg_mp") && curWeap != "rpg_mp")
 			{
-				self setSpawnWeapon("rpg_mp");
+				self BotChangeToWeapon("rpg_mp");
 				continue;
 			}
 		}
@@ -1047,7 +1047,7 @@ bot_weapon_think()
 		if(weap == "")
 			continue;
 		
-		self setSpawnWeapon(weap);//until switchToWeapon works...
+		self BotChangeToWeapon(weap);//until switchToWeapon works...
 	}
 }
 
@@ -1135,7 +1135,7 @@ bot_killstreak_think()
 			continue;
 			
 		self BotFreezeControls(true);
-		self setSpawnWeapon(self.pers["hardPointItem"]);
+		self BotChangeToWeapon(self.pers["hardPointItem"]);
 		wait 1;
 		if(isAirstrikePos && !isDefined( level.airstrikeInProgress ))
 		{
@@ -1145,7 +1145,7 @@ bot_killstreak_think()
 		self BotFreezeControls(false);
 		
 		if(self getCurrentWeapon() != self.lastDroppableWeapon)
-			self setSpawnWeapon(self.lastDroppableWeapon);
+			self BotChangeToWeapon(self.lastDroppableWeapon);
 	}
 }