Fixes #96
Merge pull request #99 from WildCard65/hpfix

Fixes #96