Possible fix for iOS issue