fix issues

fix issues