Fixing the upgrade