fix for #8768