Another attempted fix.
Merge pull request #238 from Clashnia/hqm

Another attempted fix.