Fixes issues with iOS 8b5.