--Upgrade failure fix