issue #20157: tweak.