Fixing patch for latest XCode