Fix for #8234