fixes issue #22378