diff --git a/src/utils/args/args.c b/src/utils/args/args.c
index e6995fa..89a00a3 100644
--- a/src/utils/args/args.c
+++ b/src/utils/args/args.c
@@ -67,6 +67,9 @@ int args_handler(int argc, char **argv, struct args_options *options,
         }
     }
 
+    int_to_str(arg_index - 1, index_str);
+    set_var_copy(vars, "#", index_str);
+
     if (options->type == INPUT_UNDEFINED)
         options->type = INPUT_STDIN;
 
diff --git a/tests/unit/expansion/expand.c b/tests/unit/expansion/expand.c
index fd4295d..04714bf 100644
--- a/tests/unit/expansion/expand.c
+++ b/tests/unit/expansion/expand.c
@@ -245,8 +245,6 @@ Test(expand, pid)
     struct ast_command *ast_command = ast_get_command(ast);
 
     struct hash_map *vars = vars_init();
-    vars_default(vars);
-
     struct ast_command *command2 = expand(ast_command, vars);
     cr_assert_not_null(command2, "Expansion returned NULL");
     int pid = atoi((char *)command2->command->data);
@@ -265,8 +263,6 @@ Test(expand, default_last_exit_code)
     struct ast_command *ast_command = ast_get_command(ast);
 
     struct hash_map *vars = vars_init();
-    vars_default(vars);
-
     struct ast_command *command2 = expand(ast_command, vars);
     cr_assert_not_null(command2, "Expansion returned NULL");
     int code = atoi((char *)command2->command->data);