Fix the iOS 8 problem