Fix Issue #4400
Merge pull request #4401 from rvinay88/master

Fix Issue #4400