Fix incremental upgrade problem.