diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/unbound-dhcp-leases-bridge
index e3da4860b..2d8ef1387 100644
--- a/config/unbound/unbound-dhcp-leases-bridge
+++ b/config/unbound/unbound-dhcp-leases-bridge
@@ -178,8 +178,8 @@ class UnboundDHCPLeasesBridge(object):
 
 		# Dump everything in the logs
 		log.debug("Static hosts:")
-		for hostname, addresses in hosts.items():
-			log.debug("  %-20s : %s" % (hostname, ", ".join(addresses)))
+		for name in hosts:
+			log.debug("  %-20s : %s" % (name, ", ".join(hosts[name])))
 
 		return hosts
 
@@ -402,9 +402,9 @@ class Lease(object):
 
 		address = ipaddress.ip_address(self.ipaddr)
 
-		for subnet, domain in subnets.items():
+		for subnet in subnets:
 			if address in subnet:
-				return domain
+				return subnets[subnet]
 
 		# Fall back to localdomain if no match could be found
 		return "localdomain"