Fix regression in option parsing