[fix] restore And operator in boolean equantion if statement