I believe this fixed #247
Fixing #247 the correct way, this time
Merge pull request #248 from penguinho/master

I believe this fixes #247