4.5 Upgrade fix