fix self references