fixed pull request according to comments