Fix for #22508