related_object fix