Better handling of iOS7