Fix #21

This hotfix worked for me, however I can't speak for the majority.