Fix for iOS 8