I lied, this is the last attempted fix.
Merge pull request #241 from Clashnia/hqm

I lied, this is the last attempted fix.