Hopefully fixes #1