Better iOS7 fix