diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt
index 5223d90d6c..6ba57e5115 100644
--- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt
+++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt
@@ -125,8 +125,8 @@ object AutopilotManager : IOchAutopilotStatusListener {
             false,
             TaxiPassengerModel.currentOCHOrder!!.startSiteAddr,
             TaxiPassengerModel.currentOCHOrder!!.endSiteAddr,
-            TaxiPassengerModel.currentOCHOrder!!.orderNo.toInt(),
-            TaxiPassengerModel.currentOCHOrder!!.lineId.toString(),
+            TaxiPassengerModel.currentOCHOrder!!.lineId.toInt(),
+            TaxiPassengerModel.currentOCHOrder!!.orderNo,
             System.currentTimeMillis()
         )
         return ""
@@ -211,8 +211,8 @@ object AutopilotManager : IOchAutopilotStatusListener {
                         true,
                         TaxiPassengerModel.currentOCHOrder!!.startSiteAddr,
                         TaxiPassengerModel.currentOCHOrder!!.endSiteAddr,
-                        TaxiPassengerModel.currentOCHOrder!!.orderNo.toInt(),
-                        TaxiPassengerModel.currentOCHOrder!!.lineId.toString(),
+                        TaxiPassengerModel.currentOCHOrder!!.lineId.toInt(),
+                        TaxiPassengerModel.currentOCHOrder!!.orderNo,
                         System.currentTimeMillis()
                     )
                     //startServicePilotDone()
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt
index f1eb532d68..b61efe64ab 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/AutopilotManager.kt
@@ -107,13 +107,14 @@ object AutopilotManager : IOchAutopilotStatusListener {
                     + " ,startSiteName=" + TaxiPassengerModel.currentOCHOrder!!.orderStartSite.siteName
                     + " ,endSiteName=" + TaxiPassengerModel.currentOCHOrder!!.orderEndSite.siteName
         )
+        val lineId = TaxiPassengerModel.currentLineId?:-1
         TaxiPassengerAnalyticsManager.triggerStartAutopilotEvent(
             false,
             false,
             TaxiPassengerModel.currentOCHOrder!!.orderStartSite.siteName,
             TaxiPassengerModel.currentOCHOrder!!.orderEndSite.siteName,
-            TaxiPassengerModel.currentOCHOrder!!.orderNo.toInt(),
-            TaxiPassengerModel.currentLineId.toString(),
+            lineId.toInt(),
+            TaxiPassengerModel.currentOCHOrder!!.orderNo,
             System.currentTimeMillis()
         )
         needSpeakByStartAutopilot = true