Fix #18428
Merge pull request #18438 from thatch45/odict_clense

Fix #18428