diff --git a/api/AltV.Net.Async/AsyncCore.cs b/api/AltV.Net.Async/AsyncCore.cs
index c064501cd..60570372a 100644
--- a/api/AltV.Net.Async/AsyncCore.cs
+++ b/api/AltV.Net.Async/AsyncCore.cs
@@ -986,12 +986,14 @@ public override void OnScriptRPCEvent(IntPtr eventpointer, IPlayer target, strin
 
             if (!ScriptRpcAsyncEventHandler.HasEvents()) return;
 
-            Task.Run(async () =>
+            var task = Task.Run(async () =>
             {
                 var clientScriptRPCEvent = new AsyncScriptRpcEvent(target, answerId);
                 await ScriptRpcAsyncEventHandler.CallAsync(@delegate => @delegate(clientScriptRPCEvent, target, name, objects, answerId));
             });
 
+            Task.WaitAll(task);
+
             if (UnansweredServerRpcRequest.Contains(answerId))
             {
                 target.EmitRPCAnswer(answerId, null, "Answer not handled");
diff --git a/api/AltV.Net.Shared/Elements/Entities/CheckpointType.cs b/api/AltV.Net.Shared/Elements/Entities/CheckpointType.cs
index 9e06b9ac1..ce8b6570a 100644
--- a/api/AltV.Net.Shared/Elements/Entities/CheckpointType.cs
+++ b/api/AltV.Net.Shared/Elements/Entities/CheckpointType.cs
@@ -7,11 +7,13 @@ public enum CheckpointType : byte
         CylinderTripleArrow,
         CylinderCycleArrow,
         CylinderCheckerboard,
+        CylinderWrench,
         CylinderSingleArrow2,
         CylinderDoubleArrow2,
         CylinderTripleArrow2,
         CylinderCycleArrow2,
         CylinderCheckerboard2,
+        CylinderWrench2,
         RingSingleArrow,
         RingDoubleArrow,
         RingTripleArrow,
@@ -44,12 +46,28 @@ public enum CheckpointType : byte
         Empty,
         Ring,
         Empty2,
-
-        //CylinderCustomShape,
-        //CylinderCustomShape2,
-        //CylinderCustomShape3,
-        Cylinder = 45,
+        Cylinder,
+        Cylinder1,
         Cylinder2,
-        Cylinder3
+        Cylinder3,
+        Cylinder4,
+        Cylinder5,
+        Empty3,
+        Empty4,
+        Empty5,
+        Empty6,
+        RingDollar,
+        RingWolf,
+        RingQuestionMark,
+        RingPlane,
+        RingChopper,
+        RingBoat,
+        RingCar,
+        RingBike,
+        RingBicycle,
+        RingTruck,
+        RingParachute,
+        RingJetpack,
+        RingWhirl
     }
 }
\ No newline at end of file
diff --git a/runtime b/runtime
index 2621da6b5..f7c10dc5e 160000
--- a/runtime
+++ b/runtime
@@ -1 +1 @@
-Subproject commit 2621da6b5c0e43e503acdbfa95e137a1f47fa652
+Subproject commit f7c10dc5e7f0ea46ee473a08cddc7baafc208956