diff --git a/doc/THANKS b/doc/THANKS
index df718b03c..106f2ca60 100644
--- a/doc/THANKS
+++ b/doc/THANKS
@@ -215,6 +215,9 @@ Krzysztof Kotowicz <kkotowicz@gmail.com>
 Nicolas Krassas <krasn@ans.gr>
     for reporting a bug
 
+Oliver Kuckertz <oliver.kuckertz@mologie.de>
+    for providing a minor patch
+
 Alex Landa <landa.alex86@gmail.com>
     for providing a patch adding support for XML output
 
diff --git a/lib/takeover/metasploit.py b/lib/takeover/metasploit.py
index 44c7ade8c..ad2338889 100644
--- a/lib/takeover/metasploit.py
+++ b/lib/takeover/metasploit.py
@@ -398,8 +398,9 @@ class Metasploit:
 
         if not Backend.isOs(OS.WINDOWS):
             self.execCmd("chmod +x %s" % self.shellcodeexecRemote, silent=True)
-
-        cmd = "%s %s &" % (self.shellcodeexecRemote, self.shellcodeString)
+            cmd = "%s %s &" % (self.shellcodeexecRemote, self.shellcodeString)
+        else:
+            cmd = "\"%s\" %s" % (self.shellcodeexecRemote, self.shellcodeString)
 
         self.execCmd(cmd, silent=True)