Proposed changes for NH-3579

The fix is not ideal, but seems that it does the work.