A hopeful fix?
Merge pull request #2 from aMoka/master

A hopeful fix?