Fixed for ios8 and iPhone6