Fixed option validation