Fixed upgrade savepoint