diff --git a/EvoCalculator.Core.PostCalculation/v1/Columns/Current/DateTempColumn.cs b/EvoCalculator.Core.PostCalculation/v1/Columns/Current/DateTempColumn.cs
index ee36d4f..fb31d0f 100644
--- a/EvoCalculator.Core.PostCalculation/v1/Columns/Current/DateTempColumn.cs
+++ b/EvoCalculator.Core.PostCalculation/v1/Columns/Current/DateTempColumn.cs
@@ -1,5 +1,6 @@
 using System;
 using EvoCalculator.Core.Base.Columns;
+using EvoCalculator.Core.Models.PostCalculation.Models.Prepared;
 
 namespace EvoCalculator.Core.PostCalculation.v1.Columns.Current;
 
@@ -9,9 +10,12 @@ public class DateTempColumn : BaseColumn<DateTime>
     {
     }
 
-    public void ComputeValues(BaseColumn<DateTime> currentDateColumn)
+    public void ComputeValues(PreparedValues preparedValues, BaseColumn<DateTime> currentDateColumn)
     {
-        Values[0] = Values[1] = currentDateColumn.GetValue(2).AddMonths(-1);
+        if (preparedValues.DeliveryTime == 100000001)
+            Values[0] = Values[1] = preparedValues.DateInput;
+        else
+            Values[0] = Values[1] = currentDateColumn.GetValue(1);
 
         for (var i = 2; i < Values.Length; i++)
             Values[i] = currentDateColumn.GetValue(i);
diff --git a/EvoCalculator.Core.PostCalculation/v1/Columns/Next/DateTempColumn.cs b/EvoCalculator.Core.PostCalculation/v1/Columns/Next/DateTempColumn.cs
index 223949c..e8232e3 100644
--- a/EvoCalculator.Core.PostCalculation/v1/Columns/Next/DateTempColumn.cs
+++ b/EvoCalculator.Core.PostCalculation/v1/Columns/Next/DateTempColumn.cs
@@ -14,7 +14,7 @@ public class DateTempColumn : BaseColumn<DateTime>
     public void ComputeValues(PreparedValues preparedValues, BaseColumn<DateTime> nextDateColumn)
     {
         if (preparedValues.DeliveryTime == 100000001)
-            Values[0] = Values[1] = nextDateColumn.GetValue(2).AddMonths(-1);
+            Values[0] = Values[1] = preparedValues.DateInput;
         else
             Values[0] = Values[1] = nextDateColumn.GetValue(1);
 
diff --git a/EvoCalculator.Core.PostCalculation/v1/Managers/CalculateDefault.cs b/EvoCalculator.Core.PostCalculation/v1/Managers/CalculateDefault.cs
index 48277c4..7b661b5 100644
--- a/EvoCalculator.Core.PostCalculation/v1/Managers/CalculateDefault.cs
+++ b/EvoCalculator.Core.PostCalculation/v1/Managers/CalculateDefault.cs
@@ -37,7 +37,7 @@ public static partial class CalculateManager
 
             var currentDateTempColumn =
                 new DateTempColumn(preparedValues.Nmper.Current + 1);
-            currentDateTempColumn.ComputeValues(currentDateColumn);
+            currentDateTempColumn.ComputeValues(preparedValues, currentDateColumn);
 
             var currentSumColumn = new SumColumn(preparedValues.Nmper.Current + 1, currentDateTempColumn);
             currentSumColumn.ComputeValues(preparedValues, currentTablePayments);
diff --git a/EvoCalculator.Core.PostCalculation/v1/Managers/PERWithChangingTheTerm.cs b/EvoCalculator.Core.PostCalculation/v1/Managers/PERWithChangingTheTerm.cs
index faad554..9fa7e57 100644
--- a/EvoCalculator.Core.PostCalculation/v1/Managers/PERWithChangingTheTerm.cs
+++ b/EvoCalculator.Core.PostCalculation/v1/Managers/PERWithChangingTheTerm.cs
@@ -37,7 +37,7 @@ public static partial class CalculateManager
 
             var currentDateTempColumn =
                 new DateTempColumn(preparedValues.Nmper.Current + 1);
-            currentDateTempColumn.ComputeValues(currentDateColumn);
+            currentDateTempColumn.ComputeValues(preparedValues, currentDateColumn);
 
             var currentSumColumn = new SumColumn(preparedValues.Nmper.Current + 1, currentDateTempColumn);
             currentSumColumn.ComputeValues(preparedValues, currentTablePayments);
diff --git a/EvoCalculator.Core.PostCalculation/v1/Managers/PERWithoutChangingTheTerm.cs b/EvoCalculator.Core.PostCalculation/v1/Managers/PERWithoutChangingTheTerm.cs
index 8491408..909308a 100644
--- a/EvoCalculator.Core.PostCalculation/v1/Managers/PERWithoutChangingTheTerm.cs
+++ b/EvoCalculator.Core.PostCalculation/v1/Managers/PERWithoutChangingTheTerm.cs
@@ -37,7 +37,7 @@ public static partial class CalculateManager
 
             var currentDateTempColumn =
                 new DateTempColumn(preparedValues.Nmper.Current + 1);
-            currentDateTempColumn.ComputeValues(currentDateColumn);
+            currentDateTempColumn.ComputeValues(preparedValues, currentDateColumn);
 
             var currentSumColumn = new SumColumn(preparedValues.Nmper.Current + 1, currentDateTempColumn);
             currentSumColumn.ComputeValues(preparedValues, currentTablePayments);
diff --git a/EvoCalculator.Core.PostCalculation/v2/Managers/CalculateDefault.cs b/EvoCalculator.Core.PostCalculation/v2/Managers/CalculateDefault.cs
index 0766ff2..ce95557 100644
--- a/EvoCalculator.Core.PostCalculation/v2/Managers/CalculateDefault.cs
+++ b/EvoCalculator.Core.PostCalculation/v2/Managers/CalculateDefault.cs
@@ -40,7 +40,7 @@ public static partial class CalculateManager
 
             var currentDateTempColumn =
                 new DateTempColumn(preparedValues.Nmper.Current + 1);
-            currentDateTempColumn.ComputeValues(currentDateColumn);
+            currentDateTempColumn.ComputeValues(preparedValues, currentDateColumn);
 
             var currentSumColumn = new SumColumn(preparedValues.Nmper.Current + 1, currentDateTempColumn);
             currentSumColumn.ComputeValues(preparedValues, currentTablePayments);
diff --git a/EvoCalculator.Core.PostCalculation/v2/Managers/PERWithChangingTheTerm.cs b/EvoCalculator.Core.PostCalculation/v2/Managers/PERWithChangingTheTerm.cs
index ffd9aa6..895ae4e 100644
--- a/EvoCalculator.Core.PostCalculation/v2/Managers/PERWithChangingTheTerm.cs
+++ b/EvoCalculator.Core.PostCalculation/v2/Managers/PERWithChangingTheTerm.cs
@@ -40,7 +40,7 @@ public static partial class CalculateManager
 
             var currentDateTempColumn =
                 new DateTempColumn(preparedValues.Nmper.Current + 1);
-            currentDateTempColumn.ComputeValues(currentDateColumn);
+            currentDateTempColumn.ComputeValues(preparedValues, currentDateColumn);
 
             var currentSumColumn = new SumColumn(preparedValues.Nmper.Current + 1, currentDateTempColumn);
             currentSumColumn.ComputeValues(preparedValues, currentTablePayments);
diff --git a/EvoCalculator.Core.PostCalculation/v2/Managers/PERWithoutChangingTheTerm.cs b/EvoCalculator.Core.PostCalculation/v2/Managers/PERWithoutChangingTheTerm.cs
index 2d1a876..117bb21 100644
--- a/EvoCalculator.Core.PostCalculation/v2/Managers/PERWithoutChangingTheTerm.cs
+++ b/EvoCalculator.Core.PostCalculation/v2/Managers/PERWithoutChangingTheTerm.cs
@@ -40,7 +40,7 @@ public static partial class CalculateManager
 
             var currentDateTempColumn =
                 new DateTempColumn(preparedValues.Nmper.Current + 1);
-            currentDateTempColumn.ComputeValues(currentDateColumn);
+            currentDateTempColumn.ComputeValues(preparedValues, currentDateColumn);
 
             var currentSumColumn = new SumColumn(preparedValues.Nmper.Current + 1, currentDateTempColumn);
             currentSumColumn.ComputeValues(preparedValues, currentTablePayments);