diff --git a/VERSION.txt b/VERSION.txt
index 4d42c3866b47..72e2dd4be49c 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.3.60
\ No newline at end of file
+5.3.61
\ No newline at end of file
diff --git a/app/Import/Providers/BaseImport.php b/app/Import/Providers/BaseImport.php
index 0b4d43082106..5d9a8447c2d0 100644
--- a/app/Import/Providers/BaseImport.php
+++ b/app/Import/Providers/BaseImport.php
@@ -80,7 +80,6 @@ class BaseImport
 
 	public function getCsvData($entity_type)
 	{
-		nlog("get csv data = entity name = " . $entity_type);
 
 		$base64_encoded_csv = Cache::pull($this->hash . '-' . $entity_type);
 		if (empty($base64_encoded_csv)) {
diff --git a/app/Services/Client/PaymentMethod.php b/app/Services/Client/PaymentMethod.php
index 4a18387d2215..1783dd577d10 100644
--- a/app/Services/Client/PaymentMethod.php
+++ b/app/Services/Client/PaymentMethod.php
@@ -70,24 +70,26 @@ class PaymentMethod
 
             $transformed_ids = $this->transformKeys(explode(',', $company_gateways));
 
-            $this->gateways = 
-                             CompanyGateway::with('gateway')
-                             ->where('company_id', $this->client->company_id)
+            $this->gateways = $this->client
+                             ->company
+                             ->company_gateways
                              ->whereIn('id', $transformed_ids)
                              ->where('is_deleted', false)
                              ->whereNull('deleted_at')
                              ->where('gateway_key', '!=', '54faab2ab6e3223dbe848b1686490baa')
                              ->sortby(function ($model) use ($transformed_ids) { //company gateways are sorted in order of priority
                                  return array_search($model->id, $transformed_ids);// this closure sorts for us
-                             })->get();
+                             });
 
         } else {
 
-             $this->gateways = CompanyGateway::with('gateway')
-                             ->where('company_id', $this->client->company_id)
+             $this->gateways = $this->client
+                             ->company
+                             ->company_gateways
                              ->where('gateway_key', '!=', '54faab2ab6e3223dbe848b1686490baa')
                              ->whereNull('deleted_at')
-                             ->where('is_deleted', false)->get();
+                             ->where('is_deleted', false);
+
 
         }
         
@@ -105,23 +107,25 @@ class PaymentMethod
 
             $transformed_ids = $this->transformKeys(explode(',', $company_gateways));
 
-            $this->gateways = CompanyGateway::with('gateway')
-                             ->where('company_id', $this->client->company_id)
+            $this->gateways = $this->client
+                             ->company
+                             ->company_gateways
                              ->whereIn('id', $transformed_ids)
                              ->where('is_deleted', false)
                              ->whereNull('deleted_at')
                              ->where('gateway_key', '54faab2ab6e3223dbe848b1686490baa')
                              ->sortby(function ($model) use ($transformed_ids) { //company gateways are sorted in order of priority
                                  return array_search($model->id, $transformed_ids);// this closure sorts for us
-                             })->get();
+                             });
 
         } else {
 
-             $this->gateways = CompanyGateway::with('gateway')
-                             ->where('company_id', $this->client->company_id)
+             $this->gateways = $this->client
+                             ->company
+                             ->company_gateways
                              ->where('gateway_key', '54faab2ab6e3223dbe848b1686490baa')
                              ->whereNull('deleted_at')
-                             ->where('is_deleted', false)->get();
+                             ->where('is_deleted', false);
 
         }
         
diff --git a/app/Utils/Number.php b/app/Utils/Number.php
index 87b99a80225a..40d1401a1086 100644
--- a/app/Utils/Number.php
+++ b/app/Utils/Number.php
@@ -200,10 +200,13 @@ class Number
 
         /* 08-01-2022 allow increased precision for unit price*/
         $v = rtrim(sprintf('%f', $value),"0");
-        // $precision = strlen(substr(strrchr($v, $decimal), 1));
+        $precision = strlen(substr(strrchr($v, $decimal), 1));
         
-        if($v<1)
-            $precision = strlen($v) - strrpos($v, '.') - 1;
+        // if($v<1)
+        //     $precision = strlen($v) - strrpos($v, '.') - 1;
+
+        if($precision == 1)
+            $precision = 2;
 
         $value = number_format($v, $precision, $decimal, $thousand);
         $symbol = $currency->symbol;
diff --git a/config/ninja.php b/config/ninja.php
index 491c14038953..5bbe097f9a7a 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -14,8 +14,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => '5.3.60',
-    'app_tag' => '5.3.60',
+    'app_version' => '5.3.61',
+    'app_tag' => '5.3.61',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),