Attempted fix.
Merge pull request #237 from Clashnia/hqm

Attempted fix.