Fixed boolean operator usage