Fix for #9422