Fix track order