fixed option-parsing