Fixed endless loop when selecting next track