issue #19224: Tweak