Fixing ios6 issues