Fixed the fix for #20401