fix to support the xcode upgrade