Dirty fix for iOS 8