diff --git a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs
index 6e2036ce..7f32aa68 100644
--- a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs
+++ b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs
@@ -34,7 +34,6 @@ namespace ReallifeGamemode.Server.DrivingSchool
         new Vector3(-233.65, -1133.09, 21.52),
         new Vector3(-511.5, -1079.99, 21.37),
         new Vector3(-707.52, -1239.48, 8.91),
-        new Vector3(-788.42, -1318.54, 3.49),
        }.AsReadOnly();
 
     private readonly IReadOnlyCollection<Vector3> StopBike = new List<Vector3>
@@ -143,13 +142,13 @@ namespace ReallifeGamemode.Server.DrivingSchool
 
       if (veh.GetServerVehicle() is SchoolVehicle schoolVehicle)
       {
-        if (schoolVehicle.SchoolId == 0)
+        if (schoolVehicle.SchoolId == 0 && user.IsInVehicle && user.VehicleSeat == -1)
         {
           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)
+        if(schoolVehicle.SchoolId == 2 && user.IsInVehicle && user.VehicleSeat == -1)
         {
           user.TriggerEvent("renderTextOnScreen", "Gut nun kann die Prüfung losgehen.");
           user.TriggerEvent("stopTimer");
@@ -267,7 +266,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
       {
         user.TriggerEvent("renderTextOnScreen", "Sollten Sie aus dem Fahrzeug aussteigen fallen Sie durch.");
       }
-      else if (checkpoint == 13)
+      else if (checkpoint == 11)
       {
         user.TriggerEvent("renderTextOnScreen", "Parke nun das Auto an der markierten Stelle.");
         CheckPointHandle.StartCheckPointRoute(user, StopBike, 5000, 1, 7, "bikeSchoolEventEnd");
diff --git a/ReallifeGamemode.Server/Managers/VehicleManager.cs b/ReallifeGamemode.Server/Managers/VehicleManager.cs
index 8a3453f9..6789adda 100644
--- a/ReallifeGamemode.Server/Managers/VehicleManager.cs
+++ b/ReallifeGamemode.Server/Managers/VehicleManager.cs
@@ -694,7 +694,8 @@ namespace ReallifeGamemode.Server.Managers
             "polbullet",
             "polbullet2",
             "sherbullet",
-            "hwaybullet"
+            "hwaybullet",
+            "argento"
         };
 
     private static readonly Dictionary<int, NetHandle> _serverVehicles = new Dictionary<int, NetHandle>();