fix pull request issues