fix self issue