diff --git a/code/ddns-lambda.py b/code/ddns-lambda.py
index 38f1a34..18bef86 100755
--- a/code/ddns-lambda.py
+++ b/code/ddns-lambda.py
@@ -73,7 +73,7 @@
 LOGGER = logging.getLogger()
 account_id = None
 region = None
-VERSION = '1.2.0b89'
+VERSION = '1.2.0b90'
 
 # Read Env variables
 DEBUG_LOG_LEVEL = os.environ.get('DebugLogLevel', 'INFO')
@@ -743,14 +743,21 @@ def lambda_handler(
             f"4.1 instance: {instance_id}, CNAME using tag_option.cname hostname {tag_data['option_cname'].hostname} and tag_option.cname {tag_data['option_cname'].zonename}")
         cf_hostname = tag_data['option_cname'].hostname
         cf_zonename = tag_data['option_cname'].zonename
-    elif not tag_data['option_cname'].valid and tag_data['option_cname'].hostname and f_zonename:
+    elif not tag_data['option_cname'].valid and not tag_data['option_cname'].zonename and tag_data['option_cname'].name and f_zonename:
         LOGGER.info(
-            f"4.2 instance: {instance_id}, CNAME using tag_option.cname hostname {tag_data['option_cname'].hostname} and current zone {f_zonename}")
-        cf_hostname = tag_data['option_cname'].hostname
+            f"4.2 instance: {instance_id}, CNAME using tag_option.cname hostname {tag_data['option_cname'].name} and current zone {f_zonename}")
+        cf_hostname = tag_data['option_cname'].name
         cf_zonename = f_zonename
+    elif not tag_data['option_cname'].valid and tag_data['option_cname'].zonename and tag_data['option_cname'].hostname:
+        LOGGER.info(
+            f"4.3 instance: {instance_id}, CNAME NOT using invalid tag_option.cname hostname {tag_data['option_cname'].name} and tag_option.cname zone {tag_data['option_cname'].zonename}")
+#        cf_hostname = tag_data['option_cname'].hostname
+#        cf_zonename = tag_data['option_cname'].zonename
+        cf_hostname = None
+        cf_zonename = None
     else:
         LOGGER.info(
-            f"4.3 instance: {instance_id}, CNAME no valid hostname {tag_data['option_cname'].hostname} or zone {tag_data['option_cname'].zonename}|{f_zonename} found, skipping CNAME")
+            f"4.4 instance: {instance_id}, CNAME no valid hostname {tag_data['option_cname'].hostname} or zone {tag_data['option_cname'].zonename}|{f_zonename} found, skipping CNAME")
         cf_hostname = None
         cf_zonename = None
     if cf_hostname and cf_zonename:
@@ -763,7 +770,7 @@ def lambda_handler(
             f"5.1 instance: {instance_id}, PTR using tag_option.ptrname hostname {tag_data['option_ptrname'].hostname} and tag_option.ptrname zone {tag_data['option_ptrname'].zonename}")
         p_hostname = tag_data['option_ptrname'].hostname
         p_zonename = tag_data['option_ptrname'].zonename
-    elif tag_data['option_ptrname'].defined:
+    elif not tag_data['option_ptrname'].zone_exists and tag_data['option_ptrname'].zonename:
         LOGGER.info(
             f"5.2 instance: {instance_id}, PTR using name not-valid, forcing tag_option.ptrname hostname {tag_data['option_ptrname'].hostname} and tag_option.ptrname zone {tag_data['option_ptrname'].zonename}")
         p_hostname = tag_data['option_ptrname'].hostname