Fix track selection bug