diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/MovePieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/MovePieceState.java
index 42d96035..690965ec 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/MovePieceState.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/MovePieceState.java
@@ -36,11 +36,11 @@ public void enter() {
     }
 
     private void setActivePlayer(Color activePlayer) {
-        if (!logic.getGame().getPlayerByColor(activePlayer.next(logic.getGame())).isFinished()) {
+        if (logic.getGame().getPlayerByColor(activePlayer.next(logic.getGame())).isFinished()) {
             logic.getGame().setActiveColor(logic.getGame().getActiveColor().next(logic.getGame()));
             logic.getServerSender().broadcast(new ActivePlayerMessage(activePlayer.next(logic.getGame())));
         } else {
-            setActivePlayer(activePlayer.next(logic.getGame()));
+            setActivePlayer(logic.getGame().getActiveColor());
         }
     }
 
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/ChoosePieceAutomatonState.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/ChoosePieceAutomatonState.java
index fc4e50e0..b4d5c679 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/ChoosePieceAutomatonState.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/ChoosePieceAutomatonState.java
@@ -93,7 +93,7 @@ private boolean canHomeMove(Piece piece, int moveIndex){
 
     protected int calculateTargetIndex(Piece piece){
         int steps = logic.getGame().getDiceModifier() * logic.getGame().getDiceEyes();
-        
+
         return (logic.getGame().getBoard().getInfieldIndexOfPiece(piece) + steps) % logic.getGame().getBoard().getInfield().length;
     }
 }