Bug fix for iOS 8