Hopefully fixes #4.