fixing for real the upgrade path