Upgrade to SDK 2.6