Fixed option-parsing