Fix Bug with Relationship-Handling