New attempt to fix iOS7 bugs