DHT fix
Merge pull request #932 from egbertbouman/fixes

DHT fix