diff --git a/mindinsight/ui/src/mixins/debugger-mixin.vue b/mindinsight/ui/src/mixins/debugger-mixin.vue
index 5c660070..e7fed52a 100644
--- a/mindinsight/ui/src/mixins/debugger-mixin.vue
+++ b/mindinsight/ui/src/mixins/debugger-mixin.vue
@@ -21,6 +21,7 @@ export default {
       RequestService.queryConditions(this.trainId).then((res) => {
         if (res && res.data) {
           this.conditionCollections = res.data;
+          this.addWatchPoint();
         }
       });
     },
@@ -1112,9 +1113,6 @@ export default {
                     this.version = this.metadata.backend;
                   }
                   this.trainId = encodeURIComponent(res.data.metadata.ip);
-                  if (this.trainId) {
-                    this.initCondition();
-                  }
                   if (!res.data.metadata.recommendation_confirmed && this.trainId) {
                     this.recommendWatchPointDialog = true;
                   }
diff --git a/mindinsight/ui/src/views/debugger/debugger.vue b/mindinsight/ui/src/views/debugger/debugger.vue
index 089dae3f..825ddda3 100644
--- a/mindinsight/ui/src/views/debugger/debugger.vue
+++ b/mindinsight/ui/src/views/debugger/debugger.vue
@@ -173,7 +173,7 @@ limitations under the License.
                 <i class="el-icon-circle-plus"
                    :title="$t('debugger.createWP')"
                    :class="{disable: metadata.state === 'running'}"
-                   @click="addWatchPoint"></i>
+                   @click="initCondition"></i>
               </div>
             </div>
             <div class="content-wrap">
@@ -415,7 +415,7 @@ limitations under the License.
                           {{ scope.row.value }}</el-button>
                         <el-button size="mini"
                                    type="text"
-                                   :disabled="metadata.state==='running' || !scope.row.has_pre_step"
+                                   :disabled="metadata.state==='running' || !scope.row.has_prev_step"
                                    @click="showTensor(scope.row,'compare')">
                           {{ $t('debugger.compareToPre') }}
                         </el-button>
@@ -921,6 +921,9 @@ export default {
         RequestService.updateWatchpoint(params).then(
             (res) => {
               this.defaultCheckedArr = this.$refs.tree.getCheckedKeys();
+              if (res && res.data && res.data.metadata && res.data.metadata.enable_recheck !== undefined) {
+                this.enableRecheck = res.data.metadata.enable_recheck;
+              }
             },
             (err) => {
               this.showErrorMsg(err);