Fix for NH3455.