Fix for iOS 8 SDK