ezp-22049 avoidind 'OR' condition