Fix upgrade failure