Fix circular references in associations with