Fixed EntityMatcher collisions