Upgrade bug resolved