continued on fixing iOS8 issues