diff --git a/app/PaymentDrivers/PayPalExpressPaymentDriver.php b/app/PaymentDrivers/PayPalExpressPaymentDriver.php
index 940f1617ea21..d4904e7b71dd 100644
--- a/app/PaymentDrivers/PayPalExpressPaymentDriver.php
+++ b/app/PaymentDrivers/PayPalExpressPaymentDriver.php
@@ -179,7 +179,7 @@ class PayPalExpressPaymentDriver extends BaseDriver
         $_invoice = collect($this->payment_hash->data->invoices)->first();
         $invoice = Invoice::withTrashed()->find($this->decodePrimaryKey($_invoice->invoice_id));
 
-        $this->fee = $this->feeCalc($invoice, $data['total']['amount_with_fee']);
+        // $this->fee = $this->feeCalc($invoice, $data['total']['amount_with_fee']);
 
         return [
             'currency' => $this->client->getCurrencyCode(),
@@ -218,18 +218,6 @@ class PayPalExpressPaymentDriver extends BaseDriver
                 'quantity' => 1,
             ]);
 
-
-        // if($this->fee > 0.1){
-
-        //     $items[] = new Item([
-        //         'name' => " ",
-        //         'description' => ctrans('texts.gateway_fee_description'),
-        //         'price' => $this->fee,
-        //         'quantity' => 1,
-        //     ]);
-
-        // }
-
         return $items;
 
     }
diff --git a/app/Services/Chart/ChartQueries.php b/app/Services/Chart/ChartQueries.php
index 8771bdc2afbe..6224f98d3c53 100644
--- a/app/Services/Chart/ChartQueries.php
+++ b/app/Services/Chart/ChartQueries.php
@@ -117,7 +117,7 @@ trait ChartQueries
             GROUP BY invoices.date
             HAVING currency_id = :currency_id
         "), [
-            'company_currency' => $this->company->settings->currency_id,
+            'company_currency' => (int)$this->company->settings->currency_id,
             'currency_id' => $currency_id,
             'company_id' => $this->company->id, 
             'start_date' => $start_date,