issue #22072: Tweak type data.