Fix for #4479.