Fixed argument parsing bug