diff --git a/app/Models/CompanyGateway.php b/app/Models/CompanyGateway.php
index 3e0e0206a55d..d8222df06403 100644
--- a/app/Models/CompanyGateway.php
+++ b/app/Models/CompanyGateway.php
@@ -349,7 +349,6 @@ class CompanyGateway extends BaseModel
 
                 if ($fees_and_limits->fee_percent) {
 
-
                         $divisor = 1 - ($fees_and_limits->fee_percent/100);
 
                         $gross_amount = round($adjusted_fee/$divisor,2);
@@ -368,10 +367,12 @@ class CompanyGateway extends BaseModel
                     if($fees_and_limits->fee_percent == 100){ //unusual edge case if the user wishes to charge a fee of 100% 09/01/2022
                         $fee += $amount;
                     }
+                    else
+                        $fee += round(($amount * $fees_and_limits->fee_percent / 100), 2);
                     //elseif ($fees_and_limits->adjust_fee_percent) {
                      //   $fee += round(($amount / (1 - $fees_and_limits->fee_percent / 100) - $amount), 2);
                     //} else {
-                        $fee += round(($amount * $fees_and_limits->fee_percent / 100), 2);
+                        
                     //}
                 }
         }
diff --git a/tests/Feature/CompanyGatewayApiTest.php b/tests/Feature/CompanyGatewayApiTest.php
index f1b3e5fec774..b290aecdf7bf 100644
--- a/tests/Feature/CompanyGatewayApiTest.php
+++ b/tests/Feature/CompanyGatewayApiTest.php
@@ -326,6 +326,7 @@ class CompanyGatewayApiTest extends TestCase
         $fee = new FeesAndLimits;
         $fee->fee_amount = 0;
         $fee->fee_percent = 100;
+        $fee->adjust_fee_percent = false;
         // $fee->fee_tax_name1 = 'GST';
         // $fee->fee_tax_rate1 = '10.0';