Fixes #146 Fixes #141
It's more work to ensure contributions are correct than just doing it ourselves.