issue #19156: Tweak