Fixes #16255 [ci skip]