diff --git a/lib/cmds/blockchain/blockchain.js b/lib/cmds/blockchain/blockchain.js
index a06538b18..4cbe7ba16 100644
--- a/lib/cmds/blockchain/blockchain.js
+++ b/lib/cmds/blockchain/blockchain.js
@@ -164,10 +164,10 @@ Blockchain.prototype.run = function() {
       data = data.toString();
       if (self.onReadyCallback && !self.readyCalled && data.indexOf('WebSocket endpoint opened') > -1) {
         if (self.isDev) {
-          return self.createFundAndUnlockAccounts((err) => {
+          self.createFundAndUnlockAccounts((err) => {
             if(err) console.error('Error creating, unlocking, and funding accounts', err);
-            self.readyCalled = true;
-            self.onReadyCallback();
+            //self.readyCalled = true;
+            //self.onReadyCallback();
           });
         }
         self.readyCalled = true;
diff --git a/lib/contracts/blockchain.js b/lib/contracts/blockchain.js
index b2e6344ec..aa609c27c 100644
--- a/lib/contracts/blockchain.js
+++ b/lib/contracts/blockchain.js
@@ -92,6 +92,7 @@ class Blockchain {
       },
       function fundAccountsIfNeeded(next) {
         console.dir('[blockchain/contracts]: funding accounts');
+        self.isWeb3Ready = true;
         provider.fundAccounts(next);
       }
     ], (err) => {