Supplemental fix for issue 7469
Merge pull request #2153 from 9rnsr/fix7469

Supplemental fix for issue 7469