diff --git a/ignition/modules/marketplace.js b/ignition/modules/marketplace.js
index 2ae9cb5..d5eac32 100644
--- a/ignition/modules/marketplace.js
+++ b/ignition/modules/marketplace.js
@@ -28,12 +28,12 @@ module.exports = buildModule("Marketplace", (m) => {
     [configuration, token, verifier],
     {
       from: deployer,
-    }
+    },
   )
 
   let testMarketplace
 
-  if (hre.network.config.tags.includes("local")) {
+  if (hre.network.config && hre.network.config.tags.includes("local")) {
     const { testVerifier } = m.useModule(VerifierModule)
 
     testMarketplace = m.contract(
@@ -41,7 +41,7 @@ module.exports = buildModule("Marketplace", (m) => {
       [configuration, token, testVerifier],
       {
         from: deployer,
-      }
+      },
     )
   }
 
diff --git a/ignition/modules/token.js b/ignition/modules/token.js
index a170954..7f8cb55 100644
--- a/ignition/modules/token.js
+++ b/ignition/modules/token.js
@@ -10,11 +10,13 @@ module.exports = buildModule("Token", (m) => {
     from: deployer,
   })
 
-  if (hre.network.config.tags.includes("local")) {
+  if (hre.network.config && hre.network.config.tags.includes("local")) {
     for (let i = 0; i < MAX_ACCOUNTS; i++) {
       const account = m.getAccount(i)
-      const futureId = "SendingEth" + i
-      m.send(futureId, account, MINTED_TOKENS)
+      m.call(token, "mint", [account, MINTED_TOKENS], {
+        from: deployer,
+        id: `SendingEth_${i}`,
+      })
     }
   }