Fix FK relationship again