fix: related tracking of m2m