fixing an issue from pull request