Upgrade bugfix