Quick fix for 2.5 SDK.