Fix for #9545.