diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/service/LoanScheduleAssembler.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/service/LoanScheduleAssembler.java
index 1b2158a67..5bd0cf2ce 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/service/LoanScheduleAssembler.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/service/LoanScheduleAssembler.java
@@ -472,7 +472,7 @@ public class LoanScheduleAssembler {
             final Integer minimumDaysBetweenDisbursalAndFirstRepayment, final Calendar calendar) {
 
         LocalDate derivedFirstRepayment = null;
-        LocalDate dateBasedOnRepaymentFrequency;
+        LocalDate dateBasedOnRepaymentFrequency = null;
         final LocalDate dateBasedOnMinimumDaysBetweenDisbursalAndFirstRepayment = expectedDisbursementDate
                 .plusDays(minimumDaysBetweenDisbursalAndFirstRepayment);
 
diff --git a/mifosng-provider/src/main/resources/sql/migrations/core_db/V211__minimum_days_between_disbursal_and_first_repayment.sql b/mifosng-provider/src/main/resources/sql/migrations/core_db/V211__minimum_days_between_disbursal_and_first_repayment.sql
new file mode 100644
index 000000000..7b89658b0
--- /dev/null
+++ b/mifosng-provider/src/main/resources/sql/migrations/core_db/V211__minimum_days_between_disbursal_and_first_repayment.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `m_product_loan`
+	ADD COLUMN `min_days_between_disbursal_and_first_repayment` INT(3) NULL AFTER `interest_recalculation_enabled`;
\ No newline at end of file