Fix #19160 - trivial, but widespread case not covered by previous patch