diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
index a641c2b1..c6accb1b 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
@@ -403,10 +403,8 @@ export default {
                     this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'LesionOrgan', val)
                   }
                 }
-                if (index === table.TableQuestions.Answers.length - 1) {
-                  this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'TableId', tableKey)
-                  this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'RowIndex', answer.RowIndex)
-                }
+                this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'TableId', tableKey)
+                this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'RowIndex', answer.RowIndex)
               })
             })
           })
@@ -881,7 +879,8 @@ export default {
               return
             } else if (measureData && measureData.markTool === 'ArrowAnnotate') {
               const shortId = this.getQuestionId(1, table.TableQuestions.Questions)
-              this.$set(innerForm, shortId, 5)
+              this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], shortId, 5)
+              this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'LesionShort', 5)
               lesionShort = 5
             }
           } else {
@@ -897,7 +896,8 @@ export default {
               return
             } else if (measureData && measureData.markTool === 'ArrowAnnotate') {
               const lengthId = this.getQuestionId(0, table.TableQuestions.Questions)
-              this.$set(this.questionForm, lengthId, 5)
+              this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], lengthId, 5)
+              this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'LesionLength', 5)
               lesionLength = 5
             }
           }
@@ -958,8 +958,9 @@ export default {
               return
             } else if (measureData && measureData.markTool === 'ArrowAnnotate') {
               const lengthId = this.getQuestionId(0, table.TableQuestions.Questions)
-              this.$set(innerForm, lengthId, 0)
-              lesionLength = 0
+              this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], lengthId, null)
+              this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'LesionLength', null)
+              lesionLength = null
             }
           }
         }
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
index 7fd84d37..39fdcba9 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
@@ -408,10 +408,8 @@ export default {
                     this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'IntrahepaticLesion', val)
                   }
                 }
-                if (index === table.TableQuestions.Answers.length - 1) {
-                  this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'TableId', tableKey)
-                  this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'RowIndex', answer.RowIndex)
-                }
+                this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'TableId', tableKey)
+                this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'RowIndex', answer.RowIndex)
               })
             })
           })
@@ -909,7 +907,8 @@ export default {
                 return
               } else if (measureData && measureData.markTool === 'ArrowAnnotate') {
                 const shortId = this.getQuestionId(1, table.TableQuestions.Questions)
-                this.$set(innerForm, shortId, 5)
+                this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], shortId, 5)
+                this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'LesionShort', 5)
                 lesionShort = 5
               }
             } else {
@@ -925,7 +924,8 @@ export default {
                 return
               } else if (measureData && measureData.markTool === 'ArrowAnnotate') {
                 const lengthId = this.getQuestionId(0, table.TableQuestions.Questions)
-                this.$set(this.questionForm, lengthId, 5)
+                this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], lengthId, 5)
+                this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'LesionLength', 5)
                 lesionLength = 5
               }
             }
@@ -986,8 +986,9 @@ export default {
                 return
               } else if (measureData && measureData.markTool === 'ArrowAnnotate') {
                 const lengthId = this.getQuestionId(0, table.TableQuestions.Questions)
-                this.$set(innerForm, lengthId, 0)
-                lesionLength = 0
+                this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], lengthId, null)
+                this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'LesionLength', null)
+                lesionLength = null
               }
             }
           }
@@ -1300,6 +1301,7 @@ export default {
         }
         loading.close()
       } catch(e) {
+        console.log(e)
         loading.close()
       }
     },