Issue #73

I don't know if this will actually solve anything, but it's worth a try.