Fixes #22235