diff --git a/src/main/java/Game.java b/src/main/java/Game.java
index 09e0b46..85d7a61 100644
--- a/src/main/java/Game.java
+++ b/src/main/java/Game.java
@@ -70,8 +70,14 @@ public class Game {
      * @return true if Player can roll the dice another time
      */
     public boolean checkDice(int dice, Player p, int countRolls) {
-        int figuresInBase = p.checkFigureInBase(p.figures);
-        if(figuresInBase == 4) {
+        boolean figuresOnBoard = false;
+        for(Figure f : p.figures) {
+            if (f.getPosition() > -1 && f.getPosition() < 40) {
+                figuresOnBoard = true;
+                break;
+            }
+        }
+        if(!figuresOnBoard) {
             return countRolls < 3;
         } else return dice == 6;
     }