Fix for #8654