fixed issues raised in pull request