Fix bug with CLI argument parsing