Fix for circular references (hasMany to belongsTo)