Issue #157 - AND functionality fix