Fix to upgrade step