NH-3222
Fixed with unit tests