Proposed fix for NH-3041