diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/game/Color.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Color.java
index a3a606bf..26c4fcf9 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/game/Color.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/game/Color.java
@@ -60,16 +60,14 @@ public Color next(Game game) {
             colorsInGame.add(p.getColor());
         }
 
-        int current = -1;
-        for(int i = 0; i < colorsInGame.size(); i++) {
-            Color c = colorsInGame.get(i);
+        int current = game.getActiveColor().ordinal();
 
-            if(c.equals(game.getActiveColor())) {
-                current = i;
-            }
+        int next = current + 1;
+        while (!colorsInGame.contains(Color.values()[next])) {
+            next++;
         }
 
-        return colorsInGame.get((current + 1) % colorsInGame.size());
+        return Color.values()[next];
     }
 
     /**