Fix for IOS8