diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt
index 367b907e56..3d275d20a3 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt
@@ -61,8 +61,8 @@ class ShuttleFragment : MvpFragment<ShuttleFragment?, BusPresenter?>() {
                         }
                     }
                 })
-                CallerEagleBaseFunctionCall4OchManager.addSingleToolKitCustomItem(lineView, LineView(it),10)
             }
+            CallerEagleBaseFunctionCall4OchManager.addSingleToolKitCustomItem(lineView, LineView(it),10)
         }
 
     }
@@ -109,9 +109,9 @@ class ShuttleFragment : MvpFragment<ShuttleFragment?, BusPresenter?>() {
             mPresenter!!.onDestroy(this)
         }
         if(ProjectUtils.isSaas()&& AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)) {
-            CallerEagleBaseFunctionCall4OchManager.removeToolkitByTag(mutableListOf(lineView))
-            CallerEagleBaseFunctionCall4OchManager.removeToolKitDefaultItemClickListener(lineView)
+            CallerEagleBaseFunctionCall4OchManager.removeToolkitByTag(mutableListOf(runningTaskGateWay))
         }
+        CallerEagleBaseFunctionCall4OchManager.removeToolKitDefaultItemClickListener(lineView)
         super.onDestroyView()
     }