diff --git a/src/components/input/DeadlineInput.js b/src/components/input/DeadlineInput.js
index 20eb1894d..08faabcbe 100644
--- a/src/components/input/DeadlineInput.js
+++ b/src/components/input/DeadlineInput.js
@@ -56,8 +56,8 @@ const DeadLineInput = ({
   if(currentDeadline?.deadline?.attribute && attributeData[currentDeadline.deadline.attribute]){
     currentDeadlineDate = attributeData[currentDeadline.deadline.attribute]
   }
-  else if(input.name === 'ehdotus_nahtaville_aineiston_maaraaika' && attributeData['ehdotus_kylk_aineiston_maaraaika']){
-    inputValue = attributeData['ehdotus_kylk_aineiston_maaraaika']
+  else if(input.name === 'ehdotus_nahtaville_aineiston_maaraaika'+indexString  && attributeData['ehdotus_kylk_aineiston_maaraaika'+indexString ]){
+    inputValue = attributeData['ehdotus_kylk_aineiston_maaraaika'+indexString ]
   }
   else if(input.name === 'luonnosaineiston_maaraaika'+indexString && attributeData['kaavaluonnos_kylk_aineiston_maaraaika'+indexString]){
     inputValue = attributeData['kaavaluonnos_kylk_aineiston_maaraaika'+indexString]
diff --git a/src/components/project/EditProjectTimetableModal/index.js b/src/components/project/EditProjectTimetableModal/index.js
index efd5c1f4a..adfa1b9ac 100644
--- a/src/components/project/EditProjectTimetableModal/index.js
+++ b/src/components/project/EditProjectTimetableModal/index.js
@@ -783,8 +783,8 @@ class EditProjectTimeTableModal extends Component {
                 locked: false,
                 phase: false,
                 phaseID: groupID,
-                start: phase === "luonnos" ? validValues[3].value : validValues[2].value,
-                end: validValues[0].value,
+                start: deadline,
+                end: start,
                 title: "divider"
               }
               this.state.items.add(diveverItem);