Hopefully fixes #10