Fixed iOS 8.1 changes