diff --git a/OCH/facade/src/main/java/com/mogo/och/facade/route/SweeperFacadeProvider.kt b/OCH/facade/src/main/java/com/mogo/och/facade/route/SweeperFacadeProvider.kt
index 37eb9d8fe8..0c7ad56a9d 100644
--- a/OCH/facade/src/main/java/com/mogo/och/facade/route/SweeperFacadeProvider.kt
+++ b/OCH/facade/src/main/java/com/mogo/och/facade/route/SweeperFacadeProvider.kt
@@ -51,7 +51,7 @@ import com.mogo.och.common.module.biz.provider.CommonService
         if (supportFragmentManager != null) {
             val back = supportFragmentManager.beginTransaction()
             back.replace(containerId, fragment, fragment.tag)
-            back.commit()
+            back.commitAllowingStateLoss()
         }
     }
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
index 4f4ebaf05e..d9e4081cfc 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
@@ -829,7 +829,7 @@ internal class SOPSettingView @JvmOverloads constructor(
                 if (scLineRoutingVerify.visibility == VISIBLE) {
                     params.topToBottom = R.id.scLineRoutingVerify
                 } else {
-                    params.topToBottom = R.id.scIPCReport
+                    params.topToBottom = R.id.scSweeperModeSwitch
                 }
                 it.layoutParams = params
                 it.setOnCheckedChangeListener { _, isChecked ->