Fix issue with changing relationships