Fixed option name and wrong conditions