partial fix for #22996