fix if/then/else with and and or