diff --git a/cdist/config.py b/cdist/config.py
index b0131601..b8d0672c 100644
--- a/cdist/config.py
+++ b/cdist/config.py
@@ -285,6 +285,7 @@ class Config(object):
                 host_fqdn = ''
 
             target_host = (host, host_name, host_fqdn)
+            log.debug("target_host: {}".format(target_host))
 
             local = cdist.exec.local.Local(
                 target_host=target_host,
diff --git a/cdist/core/code.py b/cdist/core/code.py
index cfc1316a..e9e2edf0 100644
--- a/cdist/core/code.py
+++ b/cdist/core/code.py
@@ -100,9 +100,7 @@ class Code(object):
     """
     # target_host is tuple (target_host, target_hostname, target_fqdn)
     def __init__(self, target_host, local, remote):
-        self.target_host = target_host[0]
-        self.target_hostname = target_host[1]
-        self.target_fqdn = target_host[2]
+        self.target_host = target_host
         self.local = local
         self.remote = remote
         self.env = {