fixes #2563 maintenance enhance and() & or() method