Relationship bugfix

*TODO*: Add regression tests.