diff --git a/src/ch/zhaw/catan/Siedler.java b/src/ch/zhaw/catan/Siedler.java
index df3fc8d..ca591ef 100644
--- a/src/ch/zhaw/catan/Siedler.java
+++ b/src/ch/zhaw/catan/Siedler.java
@@ -30,14 +30,14 @@ public class Siedler {
             switch (parser.getAction()) {
                 case NEXTPLAYER:
                     Config.Faction winner = game.getWinner();
-                    if(winner == null) {
+                    if(winner == null && false) { //todo remove false
                         game.switchToNextPlayer();
                         diceThrown = false;
-                        break;
                     } else {
-                        parser.displayWinnertext(winner);
+                        parser.displayWinnertext(game.getCurrentPlayerFaction());//todo replace with winner
                         running = false;
                     }
+                    break;
                 case BUILDSETTLEMENT:
                     parser.giveCoordinatesForStructures(Config.Structure.SETTLEMENT);
                     game.buildSettlement(parser.getPoint());