diff --git a/apps/remix-ide/src/app/providers/mainnet-vm-fork-provider.tsx b/apps/remix-ide/src/app/providers/mainnet-vm-fork-provider.tsx
index 04cfd1acd6..656cfa7a56 100644
--- a/apps/remix-ide/src/app/providers/mainnet-vm-fork-provider.tsx
+++ b/apps/remix-ide/src/app/providers/mainnet-vm-fork-provider.tsx
@@ -10,7 +10,7 @@ export class MainnetForkVMProvider extends BasicVMProvider {
         name: 'vm-mainnet-fork',
         displayName: 'Mainnet fork - Remix VM (Cancun)',
         kind: 'provider',
-        description: 'Remix VM (London)',
+        description: 'Remix VM (Cancun)',
         methods: ['sendAsync', 'init'],
         version: packageJson.version
       },
diff --git a/apps/remix-ide/src/blockchain/execution-context.js b/apps/remix-ide/src/blockchain/execution-context.js
index de6e1b3437..6079a44238 100644
--- a/apps/remix-ide/src/blockchain/execution-context.js
+++ b/apps/remix-ide/src/blockchain/execution-context.js
@@ -114,7 +114,7 @@ export class ExecutionContext {
 
   removeProvider (name) {
     if (name && this.customNetWorks[name]) {
-      if (this.executionContext === name) this.setContext('vm-shanghai', null, null, null)
+      if (this.executionContext === name) this.setContext('vm-paris', null, null, null)
       delete this.customNetWorks[name]
       this.event.trigger('removeProvider', [name])
     }
diff --git a/apps/remix-ide/webpack.config.js b/apps/remix-ide/webpack.config.js
index a1f15c8bb6..f9cd3155e5 100644
--- a/apps/remix-ide/webpack.config.js
+++ b/apps/remix-ide/webpack.config.js
@@ -123,8 +123,7 @@ module.exports = composePlugins(withNx(), withReact(), (config) => {
     new webpack.ProvidePlugin({
       Buffer: ['buffer', 'Buffer'],
       url: ['url', 'URL'],
-      process: 'process/browser',
-      'rustbn-wasm': 'rustbn-wasm'
+      process: 'process/browser'
     })
   )
 
diff --git a/libs/remix-lib/src/execution/forkAt.ts b/libs/remix-lib/src/execution/forkAt.ts
index d95f008986..163e47ab68 100644
--- a/libs/remix-lib/src/execution/forkAt.ts
+++ b/libs/remix-lib/src/execution/forkAt.ts
@@ -62,6 +62,14 @@ const forks = {
     {
       number: 15537394,
       name: 'paris'
+    },
+    {
+      number: 17034870,
+      name: 'shanghai'
+    },
+    {
+      number: 19426587,
+      name: 'cancun'
     }
   ],
   3: [
diff --git a/libs/remix-lib/src/helpers/txResultHelper.ts b/libs/remix-lib/src/helpers/txResultHelper.ts
index d19a4f1ede..44ce0e0536 100644
--- a/libs/remix-lib/src/helpers/txResultHelper.ts
+++ b/libs/remix-lib/src/helpers/txResultHelper.ts
@@ -8,10 +8,10 @@ function convertToPrefixedHex (input) {
   if (input === undefined || input === null || isHexString(input)) {
     return input
   }
-  if (typeof input === 'number') {
-    return '0x' + input.toString(16)
-  }
-  if ((input.constructor && input.constructor.name === 'BigNumber') || BN.isBN(input) || isBigInt(input)) {
+  if ((input.constructor && input.constructor.name === 'BigNumber') 
+      || BN.isBN(input) 
+      || isBigInt(input)
+      || typeof input === 'number') {
     return '0x' + input.toString(16)
   }