Fix issue #409
Merge pull request #410 from TeoTwawki/GoV-and-HuntRegistry

Fix issue #409