currentTrack fix