Fixes #16255 [ci skip]

Fixes #16255