This should fix relationships value repopulation