diff --git a/Interlace/lib/core/input.py b/Interlace/lib/core/input.py
index 7d79114..deff1e3 100644
--- a/Interlace/lib/core/input.py
+++ b/Interlace/lib/core/input.py
@@ -178,12 +178,12 @@ class InputHelper(object):
             for command in arguments.command_list:
                 commands.add(command.strip())
 
-        if arguments.port:
-            final_commands = InputHelper._replace_variable_for_commands(commands, "_port_", ports)
-
-        final_commands = InputHelper._replace_variable_for_commands(final_commands, "_target_", targets)
+        final_commands = InputHelper._replace_variable_for_commands(commands, "_target_", targets)
         final_commands = InputHelper._replace_variable_for_commands(final_commands, "_host_", targets)
 
+        if arguments.port:
+            final_commands = InputHelper._replace_variable_for_commands(final_commands, "_port_", ports)
+
         if arguments.realport:
             final_commands = InputHelper._replace_variable_for_commands(final_commands, "_port_", real_ports)