diff --git a/Assets/Scripts/Gameplay/GameplayManager.cs b/Assets/Scripts/Gameplay/GameplayManager.cs
index 6cf8f19..fb6f57f 100644
--- a/Assets/Scripts/Gameplay/GameplayManager.cs
+++ b/Assets/Scripts/Gameplay/GameplayManager.cs
@@ -93,7 +93,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
         // initialize the player list from UI.
 
         // InitPlayerTypesForLAN(null);
-        InitPlayerTypesForBotMatch(PlayerType.Player1, 1);
+        InitPlayerTypesForBotMatch(PlayerType.Player1, 3);
     }
 
     // TODO :: Call when the UI selection is made and game starts
@@ -832,13 +832,15 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
                         UpdatePlayerState(playerPawn, PlayerState.HasFinished);
                         playerGameDatasDict[currentPlayerTypeTurn].totalPawnsFinished++;
 
+                        Debug.Log($"totalPawnsFinished: {playerGameDatasDict[currentPlayerTypeTurn].totalPawnsFinished}, playerPawnsDict.Count: {playerGameDatasDict[currentPlayerTypeTurn].playerPawnsDict.Count}");
                         if (playerGameDatasDict[currentPlayerTypeTurn].totalPawnsFinished == playerGameDatasDict[currentPlayerTypeTurn].playerPawnsDict.Count)
                         {
                             CanRollDiceAgain = false;
                             
-                            SwitchPlayer();
                             if (allPlayerTypes.Contains(currentPlayerTypeTurn))
                                 allPlayerTypes.Remove(currentPlayerTypeTurn);
+                                
+                            SwitchPlayer();
 
                             Debug.Log($"PlayerTypes: {allPlayerTypes.Count}");
                         }