Bugfix for iOS 8