Fixed upgrade procedure