diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/commands/policy_run_14.sql b/fineract-provider/src/main/resources/db/changelog/tenant/commands/policy_run_14.sql
index 91c3f184b90..f017d06379f 100644
--- a/fineract-provider/src/main/resources/db/changelog/tenant/commands/policy_run_14.sql
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/commands/policy_run_14.sql
@@ -40,7 +40,7 @@
 INSERT INTO stretchy_report (report_name,report_type,report_category,report_sql,description,core_report,use_report,self_service_user_report)
 VALUES ("Amount requested in relation to the current amount of main products Policy Check", "Table", "Prequalification",
         "SELECT
-         client_details.number_of_principal_loans,
+         client_details.current_loan_amount,
          CASE
              WHEN ('${loanProductId}' = 7) AND ((client_details.current_loan_amount)/${requestedAmount} <= 4) THEN 'GREEN'
              WHEN ('${loanProductId}' = 7) AND ((client_details.current_loan_amount)/${requestedAmount} = 5) THEN 'GREEN'
diff --git a/fineract-provider/src/main/resources/db/changelog/tenant/commands/policy_run_16.sql b/fineract-provider/src/main/resources/db/changelog/tenant/commands/policy_run_16.sql
index fdb226dc193..28888c902d4 100644
--- a/fineract-provider/src/main/resources/db/changelog/tenant/commands/policy_run_16.sql
+++ b/fineract-provider/src/main/resources/db/changelog/tenant/commands/policy_run_16.sql
@@ -40,7 +40,7 @@
 INSERT INTO stretchy_report (report_name,report_type,report_category,report_sql,description,core_report,use_report,self_service_user_report)
 VALUES ("Payments outside the current term of the main product Policy Check", "Table", "Prequalification",
 "SELECT
- client_details.number_of_principal_loans,
+ client_details.number_of_pending_installments,
  CASE
      WHEN ('${loanProductId}' = 7) AND (client_details.number_of_pending_installments = 4) THEN 'GREEN'
      WHEN ('${loanProductId}' = 7) AND (client_details.number_of_pending_installments > 4) THEN 'ORANGE'