Fixing issue from pull request merge