Fix track labeling