Supplemental fix for issue 10334
Merge pull request #1353 from 9rnsr/fix10334

Supplemental fix for issue 10334