Fixed argument parsing.