Clean fix for iOS 8 :)