Final fix for iOS8 beta