Fix infinite recursion, with immidiate circular dependencies on relationships