Fix nextTrack selection