Correct option parsing