Fix #6518
Merge pull request #6526 from amitmurthy/amitm/6518

Fix #6518