diff --git a/maps/bots/_bot_internal.gsc b/maps/bots/_bot_internal.gsc
index 1cdc437..898ea4a 100644
--- a/maps/bots/_bot_internal.gsc
+++ b/maps/bots/_bot_internal.gsc
@@ -182,6 +182,12 @@ onWeaponChange()
 		{
 			first = false;
 			newWeapon = self getcurrentweapon();
+			
+			// hack fix for botstop overridding weapon
+			if ( newWeapon != "none" )
+			{
+				self switchtoweapon( newWeapon );
+			}
 		}
 		else
 		{
@@ -1658,6 +1664,7 @@ aim()
 	for ( ;; )
 	{
 		wait 0.05;
+		waittillframeend;
 		
 		if ( ( isdefined( level.intermission ) && level.intermission ) || self.bot.isfrozen )
 		{