Design flaw in deliver page

Small but irritating problem. Outputting audio with several tracks doesn't order the tracks in the same way as they lie in the edit page. Ok when there are only 2 tracks but impossible when round-tripping with eg 20 tracks to eg Logic Pro where each track has to then be identified in Logic and renamed and then moved into the correct position

solution? Just make sure that each audio track is written to the output file (eg MOV) in the same sequence as in the edit page. If the meta data with the track name could be included then so much the better