diff --git a/class/User.js b/class/User.js
index acad530..3dce782 100644
--- a/class/User.js
+++ b/class/User.js
@@ -124,8 +124,8 @@ export class User {
     for (let invoice of range) {
       invoice = JSON.parse(invoice);
       invoice.type = 'paid_invoice';
-      invoice.fee = parseInt(invoice.payment_route.total_fees_msat / 1000);
-      invoice.value = parseInt((invoice.payment_route.total_fees_msat + invoice.payment_route.total_amt_msat) / 1000);
+      invoice.fee = +invoice.payment_route.total_fees;
+      invoice.value = +invoice.payment_route.total_fees + +invoice.payment_route.total_amt;
       invoice.timestamp = invoice.decoded.timestamp;
       invoice.memo = invoice.decoded.description;
       result.push(invoice);
diff --git a/controllers/api.js b/controllers/api.js
index 4e8a568..a90fa48 100644
--- a/controllers/api.js
+++ b/controllers/api.js
@@ -133,7 +133,7 @@ router.post('/payinvoice', async function(req, res) {
       call.on('data', function(payment) {
         // payment callback
         if (payment && payment.payment_route && payment.payment_route.total_amt_msat) {
-          userBalance -= parseInt((+payment.payment_route.total_fees_msat + +payment.payment_route.total_amt_msat) / 1000);
+          userBalance -= +payment.payment_route.total_fees + +payment.payment_route.total_amt;
           u.saveBalance(userBalance);
           payment.pay_req = req.body.invoice;
           payment.decoded = info;