Hopefully fixes #134