Hopefully fixes #514