diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 70710bd..d1106d2 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -231,13 +231,8 @@ public class Controller {
       return ResponseEntity.status(400).body("The scanned station isnt a part of the cache");
     }
 
-    int i = 0;
-    for (Station station1 : cache.getStationen()) {
-      if (station1.equals(station)) {
-        break;
-      }
-      i++;
-    }
+    int i = cache.getStationen().indexOf(station);
+
 
     if (cache.getStationen().get(i - 1).equals(aktuelleStation)) {
       bearbeitet.setAktuelleStation(station);