Make it work in iOS 8