issue #22155: Tweak.