fix issues

fixed issues