diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/StartPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/StartPieceState.java
index dcd04258..7c2f26ac 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/StartPieceState.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/StartPieceState.java
@@ -39,13 +39,14 @@ public void enter() {
     public void received(RequestMoveMessage msg, int from){
         LOGGER.log(System.Logger.Level.INFO, "Received RequestMoveMessage message. is piece equals: " + piece.equals(msg.getPiece()));
         if (piece.equals(msg.getPiece())) {
+
             logic.getServerSender().broadcast(new MoveMessage(piece, false, calculateTargetIndex(piece)));
             logic.getGame().getBoard().getInfield()[logic.getGame().getBoard().getInfieldIndexOfPiece(piece)].clearOccupant();
-            Piece occ = logic.getGame().getBoard().getInfield()[logic.getGame().getPlayerByColor(piece.getColor()).getStartNodeIndex()].getOccupant();
+            Piece occ = logic.getGame().getBoard().getInfield()[calculateTargetIndex(piece)].getOccupant();
             if (occ != null){
                 logic.getGame().getPlayerByColor(occ.getColor()).addWaitingPiece(occ);
             }
-            logic.getGame().getBoard().getInfield()[logic.getGame().getPlayerByColor(piece.getColor()).getStartNodeIndex()].setOccupant(msg.getPiece());
+            logic.getGame().getBoard().getInfield()[calculateTargetIndex(piece)].setOccupant(piece);
 
             this.choosePieceAutomaton.getTurnAutomaton().setCurrentState(this.choosePieceAutomaton.getTurnAutomaton().getMovePieceState());
         }