diff --git a/maps/mp/bots/_bot.gsc b/maps/mp/bots/_bot.gsc
index add40cb..112a2b1 100644
--- a/maps/mp/bots/_bot.gsc
+++ b/maps/mp/bots/_bot.gsc
@@ -417,27 +417,7 @@ added()
 */
 add_bot()
 {
-	//bot = addTestClient();
-	setDvar("addBots", 1);
-
-	wait 0.05;
-
-	bot = undefined;
-
-	players = GetEntArray( "player", "classname" );
-	for (i = 0; i < players.size; i++)
-	{
-		player = players[i];
-
-		if (!player is_bot())
-			continue;
-
-		if (isDefined(self.pers["isBotWarfare"]))
-			continue;
-
-		bot = player;
-		break;
-	}
+	bot = addTestClient();
 
 	if (isdefined(bot))
 	{
diff --git a/maps/mp/bots/_bot_script.gsc b/maps/mp/bots/_bot_script.gsc
index 8935def..8447dc0 100644
--- a/maps/mp/bots/_bot_script.gsc
+++ b/maps/mp/bots/_bot_script.gsc
@@ -171,7 +171,7 @@ getCardTitles()
 		if (!isSubStr(card_name, "cardtitle_"))
 			continue;
 
-		cards[cards.size] = card_name;
+		cards[cards.size] = i;
 	}
 
 	return cards;
@@ -194,7 +194,7 @@ getCardIcons()
 		if (!isSubStr(card_name, "cardicon_"))
 			continue;
 
-		cards[cards.size] = card_name;
+		cards[cards.size] = i;
 	}
 
 	return cards;