diff --git a/maps/mp/bots/_bot_internal.gsc b/maps/mp/bots/_bot_internal.gsc
index a2672f0..a5c9819 100644
--- a/maps/mp/bots/_bot_internal.gsc
+++ b/maps/mp/bots/_bot_internal.gsc
@@ -422,6 +422,8 @@ onWeaponChange()
 		{
 			first = false;
 			newWeapon = self getcurrentweapon();
+			// hack fix for botstop overridding weapon
+			self switchtoweapon( newWeapon );
 		}
 		else
 		{
@@ -1447,6 +1449,7 @@ aim()
 	for ( ;; )
 	{
 		wait 0.05;
+		waittillframeend;
 		
 		if ( level.gameended || self.bot.isfrozen )
 		{