Fixed for ios7
More fixed for ios7