Fix failing upgrade