Fix #16064
Merge pull request #16082 from thatch45/16064

Fix #16064