Fixed: Upgrade process not working correctly