fixed pull request issues