BugFix on related model fetching