Ported back fix for NH-3057