Fixed an issue with the is_and_or method