     }
 
     public func resetCurrentRoute() {
+
+        // Pick and Driver car
+        lastRouteCoordinate = nil
+        firstRouteCoordinate = nil
+
+        // Visible Route
         if let visibleRoute = visibleRoute {
             removeAnnotation(visibleRoute)
             self.visibleRoute = nil
         }
-        lastRouteCoordinate = nil
     }
 
     fileprivate func resetPickupDashedLine() {


    // Visible Route
    fileprivate var visibleRoute: MGLPolyline?
    fileprivate var lastRouteCoordinate: CLLocationCoordinate2D?

    fileprivate var circleSource: MGLShapeSource?

        addAnnotation(routeLine)
        visibleRoute = routeLine

        // Hack to guarantee the Driver Cars is at the end of Route
        // Look natural
        lastRouteCoordinate = route.coordinates?.first
        firstRouteCoordinate = route.coordinates?.last

        // Centerizal
        centralizeMap()
