Fix track numbering