Relationships bug fix