Merge pull request #1811 from udan11/coverage_fix