Added workaround for iOS 8