Upgrade fix