Derp, forgot to move this in my codebase.
Merge pull request #174 from ey6es/master

I had forgotten to include the primary fix!