diff --git a/code/ddns-lambda.py b/code/ddns-lambda.py
index 3d894d7..8f5042e 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.0b36'
+VERSION = '1.2.0b37'
 
 # Read Env variables
 DEBUG_LOG_LEVEL = os.environ.get('DebugLogLevel', 'INFO')
@@ -828,7 +828,7 @@ def lambda_handler(
                         tag_data['ptr_entry'].hostname,
                         tag_data['ptr_entry'].zonename,
                         'PTR',
-                        final_private_hostname,
+                        create_fqdn(final_private_hostname, final_hosted_zone_name),
                         #                        final_private_dns_name
                     )
                     append_msg = 'PTR record in zone id: ' + \
@@ -3127,7 +3127,7 @@ def create_fqdn(host, zone):
     :return (str,str): Tuple containing hostname components (may include dot) and domain name for which a PHZ exists.  None is returned if not found.
     """
 
-    hh = parse_hostname_to_components(name)
+    hh = parse_hostname_to_components(host)
     if hh[1] == '':
         hh[1] = zone
     fqdn = hh[0] + '.' + hh[1]
diff --git a/code/ddns-lambda.zip b/code/ddns-lambda.zip
index fef7412..35391a5 100644
Binary files a/code/ddns-lambda.zip and b/code/ddns-lambda.zip differ