Prepare for ios 8.1