Fixing new option parsing.