fix issue

fix issues