diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
index 81e706cf8..ad66be3b5 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java
@@ -356,11 +356,14 @@ public class DataManagementPlanManager {
         boolean setNotification = false;
         if (dataManagementPlan.getId() != null) {
             DMP dmp1 = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().find(dataManagementPlan.getId());
+            
+            Instant dbTime = Instant.ofEpochMilli(dmp1.getModified().getTime()).truncatedTo(ChronoUnit.SECONDS);
+            Instant modelTime = Instant.ofEpochMilli(dataManagementPlan.getModified().getTime()).truncatedTo(ChronoUnit.SECONDS);
 
             if (!isUserOwnerOfDmp(dmp1, principal)) {
                 throw new Exception("User not being the creator is not authorized to edit this DMP.");
             }
-            if (Instant.ofEpochMilli(dmp1.getModified().getTime()).truncatedTo(ChronoUnit.SECONDS).toEpochMilli() != Instant.ofEpochMilli(dataManagementPlan.getModified().getTime()).truncatedTo(ChronoUnit.SECONDS).toEpochMilli()) {
+            if (dbTime.toEpochMilli() != modelTime.toEpochMilli()) {
                 throw new Exception("Another user have already edit that DMP.");
             }
             List<Dataset> datasetList = new ArrayList<>(dmp1.getDataset());
@@ -478,11 +481,14 @@ public class DataManagementPlanManager {
     public DMP createOrUpdateWithDatasets(DataManagementPlanEditorModel dataManagementPlan, Principal principal) throws Exception {
         if (dataManagementPlan.getId() != null) {
             DMP dmp1 = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().find(dataManagementPlan.getId());
+            
+            Instant dbTime = Instant.ofEpochMilli(dmp1.getModified().getTime()).truncatedTo(ChronoUnit.SECONDS);
+            Instant modelTime = Instant.ofEpochMilli(dataManagementPlan.getModified().getTime()).truncatedTo(ChronoUnit.SECONDS);
 
             if (!isUserOwnerOfDmp(dmp1, principal)) {
                 throw new Exception("User not being the creator is not authorized to edit this DMP.");
             }
-            if (Instant.ofEpochMilli(dmp1.getModified().getTime()).truncatedTo(ChronoUnit.SECONDS).toEpochMilli() != Instant.ofEpochMilli(dataManagementPlan.getModified().getTime()).truncatedTo(ChronoUnit.SECONDS).toEpochMilli()) {
+            if (dbTime.toEpochMilli() != modelTime.toEpochMilli()) {
                 throw new Exception("Another user have already edit that DMP.");
             }
             for (DatasetWizardModel dataset : dataManagementPlan.getDatasets()) {