fix boolean operators