Issue fixs