Fix track parsing