diff --git a/app/Helpers/Invoice/InvoiceItemSum.php b/app/Helpers/Invoice/InvoiceItemSum.php
index fcf9789f75aa..fd0bd9257c6e 100644
--- a/app/Helpers/Invoice/InvoiceItemSum.php
+++ b/app/Helpers/Invoice/InvoiceItemSum.php
@@ -144,7 +144,9 @@ class InvoiceItemSum
 			if($item_tax_rate3_total > 0)
 				$this->groupTax($this->item->tax_name3, $this->item->tax_rate3, $item_tax_rate3_total);
 
+
 		$this->setTotalTaxes($item_tax);
+			\Log::error($this->getTotalTaxes());
 
 		return $this;
 	}
@@ -255,6 +257,7 @@ class InvoiceItemSum
 			if($item_tax_rate3_total > 0)
 				$this->groupTax($this->item->tax_name3, $this->item->tax_rate3, $item_tax_rate3_total);
 
+			\Log::error($item_tax);
 		}
 
 		$this->setTotalTaxes($item_tax);
diff --git a/app/Helpers/Invoice/InvoiceSum.php b/app/Helpers/Invoice/InvoiceSum.php
index 77d3c7756b98..4b5efbf8b480 100644
--- a/app/Helpers/Invoice/InvoiceSum.php
+++ b/app/Helpers/Invoice/InvoiceSum.php
@@ -189,13 +189,13 @@ class InvoiceSum
 		{
 			$paid_to_date = $this->invoice->amount - $this->invoice->balance;
 
-			$this->invoice->balance = $this->getTotal() - $paid_to_date;
+			$this->invoice->balance = $this->formatValue($this->getTotal(), $this->invoice->client->currency()->precision) - $paid_to_date;
 		}
 		else
-			$this->invoice->balance = $this->getTotal();
+			$this->invoice->balance = $this->formatValue($this->getTotal(), $this->invoice->client->currency()->precision);
 
 		/* Set new calculated total */
-		$this->invoice->amount = $this->getTotal();
+		$this->invoice->amount = $this->formatValue($this->getTotal(), $this->invoice->client->currency()->precision);
 
 		return $this;
 	}
@@ -253,7 +253,7 @@ class InvoiceSum
                 return $value['key'] == $key;
             })->sum('total');
 
-            $total_line_tax -= $this->discount($total_line_tax);
+            //$total_line_tax -= $this->discount($total_line_tax);
 
             $this->tax_map[] = ['name' => $tax_name, 'total' => $total_line_tax];
 
diff --git a/app/Helpers/Invoice/Taxer.php b/app/Helpers/Invoice/Taxer.php
index 481f29702972..d3ffad6acb75 100644
--- a/app/Helpers/Invoice/Taxer.php
+++ b/app/Helpers/Invoice/Taxer.php
@@ -36,23 +36,23 @@ trait Taxer
 	public function exclusiveTax($tax_rate, $item)
 	{
 
-		$tax_rate = $this->formatValue($tax_rate, $this->currency->precision);
+		$tax_rate = $this->formatValue($tax_rate, 4);
 
-		return $this->formatValue(($item->line_total * $tax_rate/100), $this->currency->precision);
+		return $this->formatValue(($item->line_total * $tax_rate/100), 4);
 
 	}
 
 	public function calcAmountLineTax($tax_rate, $amount)
 	{
-		return $this->formatValue(($amount * $tax_rate/100), $this->currency->precision);
+		return $this->formatValue(($amount * $tax_rate/100), 4);
 	}
 
 	public function inclusiveTax($tax_rate, $item)
 	{
 
-		$tax_rate = $this->formatValue($tax_rate, $this->currency->precision);
+		$tax_rate = $this->formatValue($tax_rate, 4);
 
-		return $this->formatValue(($item->line_total - ($item->line_total / (1+$tax_rate/100))) , $this->currency->precision);
+		return $this->formatValue(($item->line_total - ($item->line_total / (1+$tax_rate/100))) , 4);
 	}
 
 }
diff --git a/app/Http/Middleware/QueryLogging.php b/app/Http/Middleware/QueryLogging.php
index 129a2310097a..eae1dad7ab35 100644
--- a/app/Http/Middleware/QueryLogging.php
+++ b/app/Http/Middleware/QueryLogging.php
@@ -49,8 +49,8 @@ class QueryLogging
                 $time = $timeEnd - $timeStart;
                 Log::info($request->method() . ' - ' . $request->url() . ": $count queries - " . $time);
                 
-                if($count > 50)
-                    Log::info($queries);
+           //     if($count > 50)
+            //        Log::info($queries);
             }
         
         }