diff --git a/main_shared/maps/mp/bots/_bot.gsc b/main_shared/maps/mp/bots/_bot.gsc
index ae566f4..b698da6 100644
--- a/main_shared/maps/mp/bots/_bot.gsc
+++ b/main_shared/maps/mp/bots/_bot.gsc
@@ -255,6 +255,7 @@ onPlayerConnect()
 		player thread onGrenadeFire();
 		player thread onWeaponFired();
 		player thread doPlayerModelFix();
+		player thread onPlayerSpawned();
 		
 		player thread connected();
 	}
@@ -664,6 +665,19 @@ addBots()
 	}
 }
 
+/*
+	When any player spawns
+*/
+onPlayerSpawned()
+{
+	self endon("disconnect");
+	for(;;)
+	{
+		self waittill ( "spawned_player" );
+		self.gib_ref = undefined;
+	}
+}
+
 /*
 	A thread for ALL players, will monitor and grenades thrown.
 */
diff --git a/main_shared/maps/mp/bots/_bot_utility.gsc b/main_shared/maps/mp/bots/_bot_utility.gsc
index bd76897..e3db5e9 100644
--- a/main_shared/maps/mp/bots/_bot_utility.gsc
+++ b/main_shared/maps/mp/bots/_bot_utility.gsc
@@ -162,7 +162,7 @@ IsBotKnifing()
 */
 IsPlayerModelOK()
 {
-	return (isDefined(self.bot_model_fix));
+	return (isDefined(self.bot_model_fix) && !isDefined(self.gib_ref));
 }
 
 /*