Corrected argument parsing