NH-3485 - Fix and unit test