Upgrade fix for 5.6