Fix build
NH-3448 and unit test