Fixed for iOS8 and iPhone6