fix self problems