further foolproofing + do not report self to matrix