Fix issue 11576.
Merge pull request #1710 from quickfur/issue11576

Fix issue 11576.