An additional fix for #17080