Bug fix for NH-3634

** Not ready for merge **