diff --git a/code/ddns-lambda.py b/code/ddns-lambda.py
index 156c583..53b38b5 100755
--- a/code/ddns-lambda.py
+++ b/code/ddns-lambda.py
@@ -73,7 +73,7 @@
 LOGGER = logging.getLogger()
 ACCOUNT = None
 REGION = None
-VERSION = '0.1.6'
+VERSION = '0.1.7'
 
 # Adjust the logging level [logging.INFO, logging.DEBUG, logging.WARNING, etc]
 LOGGER.setLevel(logging.DEBUG)
@@ -434,6 +434,7 @@ def lambda_handler(
             if custom_zone_name in valid_dns_zones:
                 LOGGER.debug("custom_zone_name already valid: %s", str(
                     custom_zone_name) + lineno())
+                zone_tag_hosted_zone_name = custom_zone_name
                 has_valid_zone_tag = True
             elif is_valid_zone(route53, custom_zone_name, hosted_zones, vpc_id, private_hosted_zone_collection):
                 zone_tag_hosted_zone_name = custom_zone_name
diff --git a/code/ddns-lambda.zip b/code/ddns-lambda.zip
index 311f25e..3ae3ff8 100644
Binary files a/code/ddns-lambda.zip and b/code/ddns-lambda.zip differ