Fixed upgrade issue