diff --git a/websockify/websocketproxy.py b/websockify/websocketproxy.py
index b6f103c1..67d7f67f 100644
--- a/websockify/websocketproxy.py
+++ b/websockify/websocketproxy.py
@@ -302,7 +302,7 @@ def __init__(self, RequestHandlerClass=ProxyRequestHandler, *args, **kwargs):
         # Last 3 timestamps command was run
         self.wrap_times    = [0, 0, 0]
 
-        if self.wrap_cmd:
+        if self.wrap_cmd and not self.unix_target:
             wsdir = os.path.dirname(sys.argv[0])
             rebinder_path = [os.path.join(wsdir, "..", "lib"),
                              os.path.join(wsdir, "..", "lib", "websockify"),
@@ -644,7 +644,7 @@ def websockify_init():
     del opts.target_cfg
 
     if sys.argv.count('--'):
-        opts.wrap_cmd = args[1:]
+        opts.wrap_cmd = args if opts.unix_listen else args[1:]
     else:
         opts.wrap_cmd = None