diff --git a/src/services/lnd/lnd.ts b/src/services/lnd/lnd.ts
index 034acf46..b8b7a96c 100644
--- a/src/services/lnd/lnd.ts
+++ b/src/services/lnd/lnd.ts
@@ -327,7 +327,7 @@ export default class {
             channelId: c.chanId,
             localBalanceSats: Number(c.localBalance),
             remoteBalanceSats: Number(c.remoteBalance),
-            htlcs: c.pendingHtlcs.map(htlc => ({ incoming: htlc.incoming, amount: Number(htlc.amount) }))
+            htlcs: c.pendingHtlcs.map(htlc => ({ incoming: htlc.incoming, amount: Number(htlc.amount), index: Number(htlc.htlcIndex), fwIndex: Number(htlc.forwardingHtlcIndex) }))
         }))
         return { confirmedBalance: Number(confirmedBalance), unconfirmedBalance: Number(unconfirmedBalance), totalBalance: Number(totalBalance), channelsBalance }
     }
diff --git a/src/services/main/watchdog.ts b/src/services/main/watchdog.ts
index 2d20dd88..54719bf4 100644
--- a/src/services/main/watchdog.ts
+++ b/src/services/main/watchdog.ts
@@ -36,7 +36,7 @@ export class Watchdog {
 
     Start = async () => {
         const totalUsersBalance = await this.storage.paymentStorage.GetTotalUsersBalance()
-        this.initialLndBalance = await this.getTotalLndBalance()
+        this.initialLndBalance = await this.getTotalLndBalance(totalUsersBalance)
         this.initialUsersBalance = totalUsersBalance
         this.enabled = true
 
@@ -48,11 +48,11 @@ export class Watchdog {
         }, 1000 * 60)
     }
 
-    getTotalLndBalance = async () => {
-        const localLog = getLogger({ appName: "debugLndBalance" })
+    getTotalLndBalance = async (usersTotal: number) => {
+        const localLog = getLogger({ appName: "debugLndBalancev2" })
         const { confirmedBalance, channelsBalance } = await this.lnd.GetBalance()
         this.log(confirmedBalance, "sats in chain wallet")
-        localLog(channelsBalance)
+        localLog({ c: channelsBalance, u: usersTotal })
         let totalBalance = confirmedBalance
         channelsBalance.forEach(c => {
             let totalBalanceInHtlcs = 0
@@ -127,7 +127,7 @@ export class Watchdog {
         }
         this.latestCheckStart = Date.now()
         const totalUsersBalance = await this.storage.paymentStorage.GetTotalUsersBalance()
-        const totalLndBalance = await this.getTotalLndBalance()
+        const totalLndBalance = await this.getTotalLndBalance(totalUsersBalance)
         const deltaLnd = totalLndBalance - this.initialLndBalance
         const deltaUsers = totalUsersBalance - this.initialUsersBalance
         const deny = this.checkBalanceUpdate(deltaLnd, deltaUsers)