BUG: Change and back to or.