fixing per #11318
Merge pull request #11392 from garethgreenaway/develop

Fix for #11318