Fixed option handling