Make it work with iOS 8