Fix #16071
Merge pull request #16104 from thatch45/16071

Fix #16071