diff --git a/fineract-loan/src/main/resources/db/changelog/tenant/module/loan/parts/1017_add_fee_and_penalty_adjustments_to_loan.xml b/fineract-loan/src/main/resources/db/changelog/tenant/module/loan/parts/1017_add_fee_and_penalty_adjustments_to_loan.xml
index faa79a4c0..6c110c4e9 100644
--- a/fineract-loan/src/main/resources/db/changelog/tenant/module/loan/parts/1017_add_fee_and_penalty_adjustments_to_loan.xml
+++ b/fineract-loan/src/main/resources/db/changelog/tenant/module/loan/parts/1017_add_fee_and_penalty_adjustments_to_loan.xml
@@ -32,11 +32,11 @@
     </changeSet>
 
     <changeSet author="fineract" id="2">
+        <validCheckSum>9:9e13876473fb1fc84046fb672fcf9309</validCheckSum>
         <addColumn tableName="m_loan_repayment_schedule">
             <column defaultValueComputed="NULL" name="credited_fee" type="DECIMAL(19, 6)"/>
             <column defaultValueComputed="NULL" name="credited_penalty" type="DECIMAL(19, 6)"/>
         </addColumn>
-        <renameColumn tableName="m_loan_repayment_schedule" oldColumnName="credits_amount" newColumnName="credited_principal"  columnDataType="DECIMAL(19, 6)"/>
     </changeSet>
 
 
diff --git a/fineract-loan/src/main/resources/db/changelog/tenant/module/loan/parts/1018_rename_credited_principal_back_to_credits_amount.xml b/fineract-loan/src/main/resources/db/changelog/tenant/module/loan/parts/1018_rename_credited_principal_back_to_credits_amount.xml
index 35e2733c3..129548bba 100644
--- a/fineract-loan/src/main/resources/db/changelog/tenant/module/loan/parts/1018_rename_credited_principal_back_to_credits_amount.xml
+++ b/fineract-loan/src/main/resources/db/changelog/tenant/module/loan/parts/1018_rename_credited_principal_back_to_credits_amount.xml
@@ -20,7 +20,12 @@
 
 -->
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd">
-    <changeSet author="fineract" id="1">
+    <changeSet author="fineract" id="1" failOnError="false">
+        <preConditions onFail="MARK_RAN" onError="MARK_RAN">
+            <sqlCheck expectedResult="1">SELECT 1
+                                         FROM information_schema.columns
+                                         WHERE table_name='m_loan_repayment_schedule' and column_name='credited_principal'</sqlCheck>
+        </preConditions>
         <renameColumn tableName="m_loan_repayment_schedule" oldColumnName="credited_principal" newColumnName="credits_amount"  columnDataType="DECIMAL(19, 6)"/>
     </changeSet>
 </databaseChangeLog>