fixing iOS8 bugs