Fixed argument parsing for command