Fixes [#21081] sigh