Hopefully fixes #270