diff --git a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs
index 7f32aa68..801055e7 100644
--- a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs
+++ b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs
@@ -142,17 +142,17 @@ namespace ReallifeGamemode.Server.DrivingSchool
 
       if (veh.GetServerVehicle() is SchoolVehicle schoolVehicle)
       {
-        if (schoolVehicle.SchoolId == 0 && user.IsInVehicle && user.VehicleSeat == -1)
+        if (schoolVehicle.SchoolId == 0 && user.IsInVehicle)
         {
           user.TriggerEvent("renderTextOnScreen", "Gut nun kann die Prüfung losgehen.");
           user.TriggerEvent("stopTimer");
           CheckPointHandle.StartCheckPointRoute(user, DrivingRoute, 0, 1, 7, "drivingSchoolEvent");
         }
-        if(schoolVehicle.SchoolId == 2 && user.IsInVehicle && user.VehicleSeat == -1)
+        if(schoolVehicle.SchoolId == 2 && user.IsInVehicle)
         {
           user.TriggerEvent("renderTextOnScreen", "Gut nun kann die Prüfung losgehen.");
           user.TriggerEvent("stopTimer");
-          CheckPointHandle.StartCheckPointRoute(user, BikeRoute, 0, 1, 7, "drivingSchoolEvent");
+          CheckPointHandle.StartCheckPointRoute(user, BikeRoute, 0, 1, 7, "bikeSchoolEvent");
         }
       }
     }
@@ -266,7 +266,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
       {
         user.TriggerEvent("renderTextOnScreen", "Sollten Sie aus dem Fahrzeug aussteigen fallen Sie durch.");
       }
-      else if (checkpoint == 11)
+      else if (checkpoint == 12)
       {
         user.TriggerEvent("renderTextOnScreen", "Parke nun das Auto an der markierten Stelle.");
         CheckPointHandle.StartCheckPointRoute(user, StopBike, 5000, 1, 7, "bikeSchoolEventEnd");