Fix and unit test from NH-3737