fix regression bug introduced by .and()/.or() implementation