NH-3408: Test and fix