Fixed iOS 8 and iPhone 6 plus compatibility