diff --git a/autorecon.py b/autorecon.py
index 28a0e22..fe4db14 100644
--- a/autorecon.py
+++ b/autorecon.py
@@ -246,6 +246,8 @@ async def service_scan(plugin, service):
 		# Create variables for fformat references.
 		address = service.target.address
 		addressv6 = service.target.address
+		ipaddress = target.ip
+		ipaddressv6 = target.ip
 		scandir = service.target.scandir
 		protocol = service.protocol
 		port = service.port
@@ -263,7 +265,9 @@ async def service_scan(plugin, service):
 
 		if service.target.ipversion == 'IPv6':
 			nmap_extra += ' -6'
-			addressv6 = '[' + addressv6 + ']'
+			if addressv6 == target.ip:
+				addressv6 = '[' + addressv6 + ']'
+			ipaddressv6 = '[' + ipaddressv6 + ']'
 
 		tag = service.tag() + '/' + plugin.slug
 
@@ -447,6 +451,8 @@ async def scan_target(target):
 			# Create variables for command references.
 			address = target.address
 			addressv6 = target.address
+			ipaddress = target.ip
+			ipaddressv6 = target.ip
 			scandir = target.scandir
 			protocol = service.protocol
 			port = service.port
@@ -463,7 +469,9 @@ async def scan_target(target):
 
 			if target.ipversion == 'IPv6':
 				nmap_extra += ' -6'
-				addressv6 = '[' + addressv6 + ']'
+				if addressv6 == target.ip:
+					addressv6 = '[' + addressv6 + ']'
+				ipaddressv6 = '[' + ipaddressv6 + ']'
 
 			service_match = False
 			matching_plugins = []
diff --git a/autorecon/targets.py b/autorecon/targets.py
index 4d7512e..351d983 100644
--- a/autorecon/targets.py
+++ b/autorecon/targets.py
@@ -37,6 +37,8 @@ class Target:
 		# Create variables for command references.
 		address = target.address
 		addressv6 = target.address
+		ipaddress = target.ip
+		ipaddressv6 = target.ip
 		scandir = target.scandir
 
 		nmap_extra = target.autorecon.args.nmap
@@ -45,7 +47,9 @@ class Target:
 
 		if target.ipversion == 'IPv6':
 			nmap_extra += ' -6'
-			addressv6 = '[' + addressv6 + ']'
+			if addressv6 == target.ip:
+				addressv6 = '[' + addressv6 + ']'
+			ipaddressv6 = '[' + ipaddressv6 + ']'
 
 		plugin = inspect.currentframe().f_back.f_locals['self']
 
@@ -117,6 +121,8 @@ class Service:
 		# Create variables for command references.
 		address = target.address
 		addressv6 = target.address
+		ipaddress = target.ip
+		ipaddressv6 = target.ip
 		scandir = target.scandir
 		protocol = self.protocol
 		port = self.port
@@ -139,7 +145,9 @@ class Service:
 
 		if target.ipversion == 'IPv6':
 			nmap_extra += ' -6'
-			addressv6 = '[' + addressv6 + ']'
+			if addressv6 == target.ip:
+				addressv6 = '[' + addressv6 + ']'
+			ipaddressv6 = '[' + ipaddressv6 + ']'
 
 		plugin = inspect.currentframe().f_back.f_locals['self']