Merge pull request #2430 from pratik-joshi/fix-for-regression