BOOLEAN_OPERATORS fix