diff --git a/modules/exploits/multi/http/stunshell_exec.rb b/modules/exploits/multi/http/stunshell_exec.rb
index 7b9f93b091..802fdd79fe 100644
--- a/modules/exploits/multi/http/stunshell_exec.rb
+++ b/modules/exploits/multi/http/stunshell_exec.rb
@@ -16,14 +16,14 @@ class Metasploit3 < Msf::Exploit::Remote
 		super(update_info(info,
 			'Name'           => 'STUNSHELL Web Shell Remote Code Execution',
 			'Description'    => %q{
-					This module exploits unauthenticated versions of the "STUNSHELL" web shell.  This
-				module works when safe mode is disabled on the web server.  This shell is widely
-				used in automated RFI payloads.
+					This module exploits unauthenticated versions of the "STUNSHELL" web shell.
+				This module works when safe mode is disabled on the web server.  This shell is
+				widely used in automated RFI payloads.
 			},
 			'License'        => MSF_LICENSE,
 			'Author'         =>
 				[
-					'bwall <bwall[at]openbwall.com>',  # vuln discovery & msf module
+					'bwall <bwall[at]openbwall.com>' # vuln discovery & msf module
 				],
 			'References'     =>
 				[
@@ -43,7 +43,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				},
 			'Platform'       => ['unix', 'win'],
 			'Arch'           => ARCH_CMD,
-			'Targets'        => 
+			'Targets'        =>
 				[
 					['stunshell / Unix', { 'Platform' => 'unix' } ],
 					['stunshell / Windows', { 'Platform' => 'win' } ]
@@ -58,7 +58,7 @@ class Metasploit3 < Msf::Exploit::Remote
 	end
 
 	def check
-		uri = normalize_uri(datastore['URI'])
+		uri = normalize_uri(target_uri.path.to_s)
 		request_parameters = {
 			'method'	=> 'POST',
 			'uri'		=> uri,
@@ -75,7 +75,7 @@ class Metasploit3 < Msf::Exploit::Remote
 	end
 
 	def http_send_command(cmd)
-		uri = normalize_uri(datastore['URI'])
+		uri = normalize_uri(target_uri.path.to_s)
 		request_parameters = {
 			'method'	=> 'POST',
 			'uri'		=> uri,