Boolean operator fix