Fixing #18181

Fixing #18181