Fix bug with argument parsing