Fix for #8602