diff --git a/src/main/java/ch/zhaw/pm2/racetrack/Game.java b/src/main/java/ch/zhaw/pm2/racetrack/Game.java
index 56fbf31..457d278 100644
--- a/src/main/java/ch/zhaw/pm2/racetrack/Game.java
+++ b/src/main/java/ch/zhaw/pm2/racetrack/Game.java
@@ -197,9 +197,12 @@ public class Game implements GameSpecification {
     @Override
     public void switchToNextActiveCar() {
         do {
-            if (currentCarIndex++ > track.getCarCount()) {
+            if ((currentCarIndex + 1) == track.getCarCount()) {
                 currentCarIndex = 0;
             }
+            else {
+                currentCarIndex ++;
+            }
         } while (track.getCar(currentCarIndex).isCrashed());
         // TODO: evtl andere Kapselung
     }