fix iOS8 issues