diff --git a/code/ddns-lambda.py b/code/ddns-lambda.py
index 5daba7d..74878ab 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.0b49'
+VERSION = '1.2.0b50'
 
 # Read Env variables
 DEBUG_LOG_LEVEL = os.environ.get('DebugLogLevel', 'INFO')
@@ -650,7 +650,7 @@ def lambda_handler(
                         instance_id, tag_data['option_name'].hostname, tag_data['option_name'].zonename)
             f_hostname = tag_data['option_name'].hostname
             f_zonename = tag_data['option_name'].zonename
-        if not tag_data['option_name'].valid and tag_data['option_name'].hostname != '' and tag_data['dhcp_options'].valid:
+        elif not tag_data['option_name'].valid and tag_data['option_name'].hostname != '' and tag_data['dhcp_options'].valid:
             LOGGER.info("instance: %s, using tag_option.name hostname %s and and dhcp_options zone %s.",
                         instance_id, tag_data['option_name'].hostname, tag_data['dhcp_options'].zonename)
             f_hostname = tag_data['option_name'].hostname