NH-3658 (fixed)