Fixed another little bug with cmd_var_swap()