Added fix for latest Xcode