Merge pull request #688 from philmayers/fix-nthash