Fixing offset handling with ios 7