Apple Health XML data export

Apple Health XML data export doesn't appear to group together Systolic and Diastolic BP values from the same reading. It appears that the only (inconvenient) way to associate them is by startDate. Is this likely to be fixed so the export is more useful?