diff --git a/lib/core.js b/lib/core.js
index 4c6226d..b39b2d3 100644
--- a/lib/core.js
+++ b/lib/core.js
@@ -242,14 +242,15 @@ module.exports.create = function (le) {
               //
               certReq.setChallenge = function (domain, key, value, done) {
                 log(args.debug, "setChallenge called for '" + domain + "'");
-                var copy = utils.merge({ domains: [domain] }, le);
+                var copy = utils.merge({ domains: [domain] }, args);
+                copy = utils.merge(copy, le);
                 utils.tplCopy(copy);
 
                 // TODO need to save challengeType
                 le.challenges[args.challengeType].set(copy, domain, key, value, done);
               };
               certReq.removeChallenge = function (domain, key, done) {
-                log(args.debug, "setChallenge called for '" + domain + "'");
+                log(args.debug, "removeChallenge called for '" + domain + "'");
                 var copy = utils.merge({ domains: [domain] }, le);
                 utils.tplCopy(copy);