Fixed iOS8 related issue