Bug fix in iOS8