diff --git a/EvoCalculator.Core/Controllers/v1/CalculationController.cs b/EvoCalculator.Core/Controllers/v1/CalculationController.cs
index 35ae081..a5b3b96 100644
--- a/EvoCalculator.Core/Controllers/v1/CalculationController.cs
+++ b/EvoCalculator.Core/Controllers/v1/CalculationController.cs
@@ -26,10 +26,15 @@ namespace EvoCalculator.Core.Controllers.V1
 
             var postValues = new PostValues();
 
-            var dateColumn = new DateColumn(requestCalculation.preparedValues.Nmper + 1);
+
+            var maxColumnLength = preparedValues.Nmper > preparedValues.NmperDeprecation
+                ? preparedValues.Nmper + 1
+                : preparedValues.NmperDeprecation + 2;
+
+            var dateColumn = new DateColumn(preparedValues.Nmper + 1);
             dateColumn.ComputeValues(preparedValues, constants);
 
-            var dateTempColumn = new DateTempColumn(preparedValues.NmperDeprecation + 2);
+            var dateTempColumn = new DateTempColumn(maxColumnLength);
             dateTempColumn.ComputeValues(preparedValues);
 
             var percentPaymentColumn = new PercentPaymentColumn(preparedPayments.Rows.Length + 1);