Hopefully fixes #52