references updated properly on regular move