diff --git a/extra/shellcodeexec/linux/shellcodeexec.x32 b/extra/shellcodeexec/linux/shellcodeexec.x32
deleted file mode 100755
index 9abdb5a50..000000000
Binary files a/extra/shellcodeexec/linux/shellcodeexec.x32 and /dev/null differ
diff --git a/extra/shellcodeexec/linux/shellcodeexec.x32_ b/extra/shellcodeexec/linux/shellcodeexec.x32_
new file mode 100644
index 000000000..cc5917254
Binary files /dev/null and b/extra/shellcodeexec/linux/shellcodeexec.x32_ differ
diff --git a/extra/shellcodeexec/linux/shellcodeexec.x64 b/extra/shellcodeexec/linux/shellcodeexec.x64
deleted file mode 100755
index 4765da301..000000000
Binary files a/extra/shellcodeexec/linux/shellcodeexec.x64 and /dev/null differ
diff --git a/extra/shellcodeexec/linux/shellcodeexec.x64_ b/extra/shellcodeexec/linux/shellcodeexec.x64_
new file mode 100644
index 000000000..25aa6ea4a
Binary files /dev/null and b/extra/shellcodeexec/linux/shellcodeexec.x64_ differ
diff --git a/extra/shellcodeexec/windows/shellcodeexec.x32.exe b/extra/shellcodeexec/windows/shellcodeexec.x32.exe
deleted file mode 100755
index 382727954..000000000
Binary files a/extra/shellcodeexec/windows/shellcodeexec.x32.exe and /dev/null differ
diff --git a/extra/shellcodeexec/windows/shellcodeexec.x32.exe_ b/extra/shellcodeexec/windows/shellcodeexec.x32.exe_
new file mode 100644
index 000000000..a26bb6e10
Binary files /dev/null and b/extra/shellcodeexec/windows/shellcodeexec.x32.exe_ differ
diff --git a/lib/takeover/metasploit.py b/lib/takeover/metasploit.py
index eae01bad0..acfbea8ac 100644
--- a/lib/takeover/metasploit.py
+++ b/lib/takeover/metasploit.py
@@ -537,9 +537,9 @@ class Metasploit:
         self.shellcodeexecLocal = os.path.join(paths.SQLMAP_EXTRAS_PATH, "shellcodeexec")
 
         if Backend.isOs(OS.WINDOWS):
-            self.shellcodeexecLocal = os.path.join(self.shellcodeexecLocal, "windows", "shellcodeexec.x%s.exe" % "32")
+            self.shellcodeexecLocal = os.path.join(self.shellcodeexecLocal, "windows", "shellcodeexec.x%s.exe_" % "32")
         else:
-            self.shellcodeexecLocal = os.path.join(self.shellcodeexecLocal, "linux", "shellcodeexec.x%s" % Backend.getArch())
+            self.shellcodeexecLocal = os.path.join(self.shellcodeexecLocal, "linux", "shellcodeexec.x%s_" % Backend.getArch())
 
         __basename = "tmpse%s%s" % (self._randStr, ".exe" if Backend.isOs(OS.WINDOWS) else "")