Fix for #9359.