diff --git a/scripts/q7s-cp.py b/scripts/q7s-cp.py
index e3b1f37c..4666dfa1 100755
--- a/scripts/q7s-cp.py
+++ b/scripts/q7s-cp.py
@@ -68,21 +68,29 @@ def build_cmd(args):
     cmd = "scp "
     if args.recursive:
         cmd += "-r "
+    address = ""
+    port_args = ""
+    target = args.target
     if args.flatsat:
-        cmd += f"{args.source} eive@flatsat.eive.absatvirt.lw:{target}"
+        address = "eive@flatsat.eive.absatvirt.lw"
     else:
-        target = args.target
-        if args.invert and target == "":
+        address = "root@localhost"
+        port_args=f"-P {args.port}"
+    if args.invert:
+        if target == "":
             target = "."
-        elif target == "":
-            target = f"/tmp"
-        if args.invert:
-            cmd += f"-P {args.port} root@localhost:{args.source} {target}"
         else:
-            cmd += f"-P {args.port} {args.source} root@localhost:{target}"
-        if args.target:
-            cmd += args.target
-        return cmd
+            target = args.target
+    else:
+        if target == "":
+            target = f"/tmp"
+        else:
+            target = args.target
+    if args.invert:
+        cmd += f"{port_args} {address}:{args.source} {target}"
+    else:
+        cmd += f"{port_args} {args.source} {address}:{target}"
+    return cmd
 
 
 if __name__ == "__main__":