Fixed upgrade problem