Fixed option parser