Fixed option conditions