Fix for #9111