diff --git a/src/models/MiningJob.ts b/src/models/MiningJob.ts
index 370106b..29e6eaf 100644
--- a/src/models/MiningJob.ts
+++ b/src/models/MiningJob.ts
@@ -158,7 +158,7 @@ export class MiningJob {
         const addressInfo = getAddressInfo(address);
         switch (addressInfo.type) {
             case AddressType.p2wpkh: {
-                return bitcoinjs.payments.p2wpkh({ address, network: bitcoinjs.networks.testnet }).output;
+                return bitcoinjs.payments.p2wpkh({ address }).output;
             }
             case AddressType.p2pkh: {
                 return bitcoinjs.payments.p2pkh({ address }).output;
diff --git a/src/models/StratumV1Client.ts b/src/models/StratumV1Client.ts
index c6ee444..cdec25f 100644
--- a/src/models/StratumV1Client.ts
+++ b/src/models/StratumV1Client.ts
@@ -353,11 +353,11 @@ export class StratumV1Client extends EasyUnsubscribe {
                     'Duplicate share').response();
                 console.error(err);
                 await this.promiseSocket.write(err);
+            }
 
-                if (submissionDifficulty > this.entity.bestDifficulty) {
-                    await this.clientService.updateBestDifficulty(this.extraNonce, submissionDifficulty);
-                    this.entity.bestDifficulty = submissionDifficulty;
-                }
+            if (submissionDifficulty > this.entity.bestDifficulty) {
+                await this.clientService.updateBestDifficulty(this.extraNonce, submissionDifficulty);
+                this.entity.bestDifficulty = submissionDifficulty;
             }
 
         } else {