fix if and