diff --git a/Simulator/RobotEssentials/Robot.cs b/Simulator/RobotEssentials/Robot.cs
index 1c5802a..100319f 100644
--- a/Simulator/RobotEssentials/Robot.cs
+++ b/Simulator/RobotEssentials/Robot.cs
@@ -463,7 +463,7 @@ private void MoveToWaypoint()
                 return;
             }
             var Waypoint = CurrentTask.Move.Waypoint;
-            var MachinePoint = CurrentTask.Move.MachinePoint;
+            var MachinePoint = CurrentTask.Move.Waypoint.Split("#")[1];
             Zone targetZone = ZonesManager.GetInstance().GetWaypoint(Waypoint, MachinePoint);
             if (targetZone == 0)
             {