fix for #8993#