issue #19456: Tweak