fix ios7 and 8 issues