Fix issue 10800
Merge pull request #1466 from Kapps/master

Fix issue 10800