Fixup for issue 11532
Merge pull request #1698 from yebblies/issue11532

[trivial] Fixup for issue 11532