diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java
index 38969cc2b..c70b4a681 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java
@@ -431,7 +431,7 @@ public class Loan extends AbstractPersistable<Long> {
 
         validateChargeHasValidSpecifiedDateIfApplicable(loanCharge, getDisbursementDate(), getLastRepaymentPeriodDueDate());
 
-        this.summary = updateSummaryWithTotalFeeChargesDueAtDisbursement(deriveSumTotalOfChargesDueAtDisbursement());
+        
 
         loanCharge.update(this);
 
@@ -455,7 +455,7 @@ public class Loan extends AbstractPersistable<Long> {
         // NOTE: must add new loan charge to set of loan charges before
         // reporcessing the repayment schedule.
         this.charges.add(loanCharge);
-
+        this.summary = updateSummaryWithTotalFeeChargesDueAtDisbursement(deriveSumTotalOfChargesDueAtDisbursement());
         final LoanRepaymentScheduleTransactionProcessor loanRepaymentScheduleTransactionProcessor = this.transactionProcessorFactory
                 .determineProcessor(this.transactionProcessingStrategy);
 
@@ -1244,6 +1244,7 @@ public class Loan extends AbstractPersistable<Long> {
 
         updateLoanSchedule(loanSchedule);
 
+        
         LoanStatus from = null;
         if (this.loanStatus != null) {
             from = LoanStatus.fromInt(this.loanStatus);
@@ -1307,6 +1308,8 @@ public class Loan extends AbstractPersistable<Long> {
                     totalChargeAmt);
             validateChargeHasValidSpecifiedDateIfApplicable(loanCharge, getDisbursementDate(), getLastRepaymentPeriodDueDate());
         }
+        
+        updateSummaryWithTotalFeeChargesDueAtDisbursement(deriveSumTotalOfChargesDueAtDisbursement());
 
         // validate if disbursement date is a holiday or a non-working day
         validateDisbursementDateIsOnNonWorkingDay(workingDays, allowTransactionsOnNonWorkingDay);
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanCharge.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanCharge.java
index e4bb29174..330d4fb80 100755
--- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanCharge.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanCharge.java
@@ -553,6 +553,10 @@ public class LoanCharge extends AbstractPersistable<Long> {
             }
         }
         minMaxCap = percentageOf;
+        // this will round the amount value
+        if(this.loan != null && minMaxCap !=null){
+            minMaxCap = Money.of(this.loan.getCurrency(), minMaxCap).getAmount();
+        }
         return minMaxCap;
     }