Initial fix for iOS 7