Fix issue 11020
Merge pull request #11022 from olliewalsh/issue_11020

Fix issue 11020