Upgrade fix again