Fix for #8808.