Last attempted fix.
Merge pull request #240 from Clashnia/hqm

Last attempted fix.