gah, overlapping from OR instead of AND