fix for #9367