Fix for new Xcode version