Fix for boolean operator matching