Fixed argument parsing