fixed option parsing