fix for #8793