diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/SelectPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/SelectPieceState.java
index 21eee439..01592d89 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/SelectPieceState.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/SelectPieceState.java
@@ -87,12 +87,6 @@ public void received(MoveMessage msg) {
 
 
             }
-            /*
-            logic.addNotification(new HomeMoveNotification(piece.getUuid(), msg.getTargetIndex()));
-            logic.getGame().getBoard().getInfield()[logic.getGame().getBoard().getInfieldIndexOfPiece(piece)].clearOccupant();
-            logic.getGame().getPlayerByColor(piece.getColor()).setPieceInHome(msg.getTargetIndex(), piece);
-
-             */
         } else {
             int oldIndex = logic.getGame().getBoard().getInfieldIndexOfPiece(piece);
 
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 27323b45..c3c3e0f8 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
@@ -88,6 +88,7 @@ protected boolean canPieceMoveInHome(Piece piece, int steps) {
             //tests if the steps are less than the possible movement
             System.out.println("Server: ChoosePieceAutomaton: canPieceMoveInHome: reached second if: (4 - homeIdx) > steps:" + ((4 - homeIdx) > steps) + "steps:" + steps + "homeIdx:" + homeIdx);
             if ((3 - homeIdx) >= steps - 1) {
+                //TODO
                 System.out.println("Server: canPieceMoveInHome: !jumpOver" + !jumpOver(steps-1, homeIdx, false));
                 return !jumpOver(steps-1, homeIdx, false);
             }
@@ -138,7 +139,7 @@ private boolean jumpOver(int stepsInHome, int homeIdx, boolean outside) {
         //tests if the piece jumps over a piece from inside the home
         else {
             if (logic.getGame().getActivePlayer().getHomeNodes()[stepsInHome + homeIdx].isOccupied()) return true;
-            for (int i = 1 + homeIdx; i < homeIdx + stepsInHome; i++) {
+            for (int i = 1 + homeIdx; i < homeIdx-1 + stepsInHome; i++) {
                 if (logic.getGame().getActivePlayer().getHomeNodes()[i].isOccupied()) return true;
             }
         }