1 files changed, 7 insertions, 4 deletions
diff --git a/src/common.py b/src/common.py
index 2da7835b..26b5dd0f 100644
--- a/src/common.py
+++ b/src/common.py
@@ -235,13 +235,16 @@ def parse_secs_to_str(duration=0):
     result += '%ss' % secs if secs else ''
     return result
 
-def parse_command_args_to_alias(args, strto):
+def parse_command_args_to_alias(arg, strto):
     """
     Parse command parameters.
     Numbers can be from 0 to 9.
-    >>> parse_command_args_to_alias(['sdf', 'koin'], '%0 %1')
-    "sdf koin"
+    >>> parse_command_args_to_alias('sdf koin', '%1 %0')
+    "koin sdf"
     """
+    if '%' not in strto:
+        return strto + arg
+    args = shell_split(arg)
     l = len(args)
     dest = ''
     var_num = False
@@ -250,7 +253,7 @@ def parse_command_args_to_alias(args, strto):
             if not var_num:
                 dest += i
             elif i in string.digits:
-                if int(i) < l:
+                if 0 <= int(i) < l:
                     dest += args[int(i)]
                 var_num = False
         elif i == '%':