Blind fix for #484

I'm pretty sure this should do the trick though.
Merge pull request #941 from pculture/gh-484

Blind fix for #484