Fix the option parser