Fixes #22081