diff --git a/dapps/tests/app/config/contracts.js b/dapps/tests/app/config/contracts.js
index 4b4900fc1..dab862eeb 100644
--- a/dapps/tests/app/config/contracts.js
+++ b/dapps/tests/app/config/contracts.js
@@ -40,10 +40,10 @@ module.exports = {
         args: [100]
       },
       ContractArgs: {
-        args: [
-          ["$MyToken2", "$SimpleStorage"],
-          123
-        ]
+        args: {
+          initialValue: 123,
+          _addresses: ["$MyToken2", "$SimpleStorage"]
+        }
       },
       SomeContract: {
         deployIf: 'await MyToken.methods.isAvailable().call()',
diff --git a/packages/plugins/ens/src/index.js b/packages/plugins/ens/src/index.js
index 67c4cbaa2..70de7f229 100644
--- a/packages/plugins/ens/src/index.js
+++ b/packages/plugins/ens/src/index.js
@@ -361,31 +361,61 @@ class ENS {
   modifyENSArguments(params, callback) {
     const self = this;
 
-    function checkArgs(argus, cb) {
-      async.map(argus, (arg, nextEachCb) => {
-        if (Array.isArray(arg)) {
-          return checkArgs(arg, nextEachCb);
-        }
-
-        if (!self.isENSName(arg)) {
-          return nextEachCb(null, arg);
-        }
-        self.ensResolve(arg,  (err, address) => {
-          if (err) {
-            return nextEachCb(err);
-          }
-          nextEachCb(null, address);
-        });
-      }, cb);
-    }
-
-    checkArgs(params.contract.args, (err, realArgs) => {
+    checkArgs(params.contract.args, (err, args) => {
       if (err) {
         return callback(err);
       }
-      params.contract.args = realArgs;
+      params.contract.args = args;
       callback(null, params);
     });
+
+    function checkArgs(args, done) {
+      if (Array.isArray(args)) {
+        async.map(args, (arg, next) => {
+          if (Array.isArray(arg)) {
+            return checkArgs(arg, next);
+          }
+
+          if (!self.isENSName(arg)) {
+            return next(null, arg);
+          }
+
+          self.ensResolve(arg,  (err, address) => {
+            if (err) {
+              return next(err);
+            }
+            next(null, address);
+          });
+        }, done);
+      } else {
+        let updatedArgs = {};
+        async.each(Object.keys(args), (key, next) => {
+          const arg = args[key];
+          if (Array.isArray(arg)) {
+            return checkArgs(arg, (err, values) => {
+              updatedArgs[key] = values;
+              next(null);
+            });
+          }
+          if (!self.isENSName(arg)) {
+            updatedArgs[key] = arg;
+            return next(null);
+          }
+          self.ensResolve(arg, (err, address) => {
+            if (err) {
+              return next(err);
+            }
+            updatedArgs[key] = address;
+            next(null);
+          });
+        }, err => {
+          if (err) {
+            return done(err);
+          }
+          done(null, updatedArgs);
+        });
+      }
+    }
   }
 
   ensResolve(name, cb) {