diff --git a/src/smartcontracts/smartContract.spec.ts b/src/smartcontracts/smartContract.spec.ts
index 51233d05..25ef5f02 100644
--- a/src/smartcontracts/smartContract.spec.ts
+++ b/src/smartcontracts/smartContract.spec.ts
@@ -49,7 +49,7 @@ describe("test contract", () => {
         deployTransaction.setNonce(alice.account.nonce);
 
         assert.equal(deployTransaction.getData().valueOf().toString(), "01020304@0500@0100");
-        assert.equal(deployTransaction.getGasLimit().valueOf(), 1000000);
+        assert.equal(deployTransaction.getGasLimit().valueOf(), 1077000);
         assert.equal(deployTransaction.getNonce().valueOf(), 42);
 
         // Compute & set the contract address
diff --git a/src/transactionIntentsFactories/smartContractTransactionIntentsFactory.ts b/src/transactionIntentsFactories/smartContractTransactionIntentsFactory.ts
index 4a3475ca..1aeda4df 100644
--- a/src/transactionIntentsFactories/smartContractTransactionIntentsFactory.ts
+++ b/src/transactionIntentsFactories/smartContractTransactionIntentsFactory.ts
@@ -47,10 +47,10 @@ export class SmartContractTransactionIntentsFactory {
         isPayable?: boolean,
         isPayableBySmartContract?: boolean
     }): TransactionIntent {
-        const isUpgradeable = options.isUpgradeable || true;
-        const isReadable = options.isReadable || true;
-        const isPayable = options.isPayable || false;
-        const isPayableBySmartContract = options.isPayableBySmartContract || true;
+        const isUpgradeable = options.isUpgradeable ?? true;
+        const isReadable = options.isReadable ?? true;
+        const isPayable = options.isPayable ?? false;
+        const isPayableBySmartContract = options.isPayableBySmartContract ?? true;
 
         const args = options.args || [];