Fix issue with Xcode 6