diff --git a/nmap_cmd.xsl b/nmap_cmd.xsl
index 97e2cfd..85cb400 100644
--- a/nmap_cmd.xsl
+++ b/nmap_cmd.xsl
@@ -8,7 +8,7 @@
 <xsl:param name="site"/>
 
 <xsl:template match="lanScan">
-<xsl:text>nmap -v -T4 -p </xsl:text>
+<xsl:text>nmap -v -T4 -Pn -p </xsl:text>
 <xsl:apply-templates select="//service[not(.=preceding::*)]" />
 <xsl:text> --script nse/ --datadir nse/ --script-args-file script-args.ini -oX "</xsl:text>
 <xsl:value-of select="@scanpath"/>
@@ -32,4 +32,4 @@
 </xsl:if>
 </xsl:template>
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/nse/smb-shares-size.nse b/nse/smb-shares-size.nse
index 8b54bc8..d40a43e 100644
--- a/nse/smb-shares-size.nse
+++ b/nse/smb-shares-size.nse
@@ -1,5 +1,6 @@
 local stdnse    = require "stdnse"
 local smb       = require "smb"
+local smb2      = require "smb2"
 local msrpc     = require "msrpc"
 local bin       = require "bin"
 local shortport = require "shortport"
@@ -146,7 +147,11 @@ function send_transaction2(smbstate, sub_command, function_parameters, function_
   stdnse.debug2("SMB: Sending SMB_COM_TRANSACTION2")
   local result, err = smb.smb_send(smbstate, header, parameters, data, overrides)
   if(result == false) then
-    return false, err
+    stdnse.debug1("SMB: Try SMBv2 connexion")
+    local result, err = smb2.smb2_send(smbstate, header, parameters, data, overrides)
+    if(result == false) then
+      return false, err
+    end
   end
 
   return true
@@ -157,7 +162,11 @@ function receive_transaction2(smbstate)
   -- Read the result
   local status, header, parameters, data = smb.smb_read(smbstate)
   if(status ~= true) then
-    return false, header
+    stdnse.debug1("SMB: Try SMBv2 connexion")
+    local status, header, parameters, data = smb2.smb2_read(smbstate)
+      if(status ~= true) then
+        return false, header
+      end
   end
 
   -- Check if it worked