Nh issue 123

See #123