Upgrade to 2.6