Fix for #7285.