diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/MoGoVisualAngleChangeProvider.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/MoGoVisualAngleChangeProvider.kt
index d947b3ea98..ab544b13de 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/MoGoVisualAngleChangeProvider.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/MoGoVisualAngleChangeProvider.kt
@@ -35,18 +35,19 @@ class MoGoVisualAngleChangeProvider: IMoGoVisualAngleChangeProvider {
 
     private val listeners by lazy { ConcurrentHashMap<String, ArrayList<OnMoGoVisualAngleSceneChangeListener>>() }
 
-    private val triggerLocation = AtomicReference<MogoLocation>()
-
-    private val distanceOfCarToStopLine = AtomicReference(0.0)
-
-    private val travelled by lazy { AtomicReference(0.0) }
-
     private val prevScene by lazy { AtomicReference<Scene>() }
 
     private val listener = object : IMoGoMapRoadListener {
         private val roadId = AtomicReference<String>()
         private val triggerRoadId = AtomicReference<String>()
+        @Volatile
         private var inCrossRoad = false
+        @Volatile
+        private var hasCrossRoad = false
+        private val distanceOfCarToStopLine = AtomicReference(0.0)
+        private val triggerLocation = AtomicReference<MogoLocation>()
+        private val travelled by lazy { AtomicReference(0.0) }
+
         override fun onRoadIdInfo(roadId: String) {
             this.roadId.set(roadId)
             Log.d(TAG, "-- onRoadIdInfo --: prev: ${this.triggerRoadId.get()} -> curr: $roadId")
@@ -132,9 +133,6 @@ class MoGoVisualAngleChangeProvider: IMoGoVisualAngleChangeProvider {
         CallerMapRoadListenerManager.addListener(TAG, listener)
     }
 
-    @Volatile
-    private var hasCrossRoad = false
-
     private var scope: CoroutineScope = acquireScope()
 
     private fun acquireScope(): CoroutineScope {