Hopefully fixes #34