Fixed upgrade to 0.7