fixed order issue in tracks (I think)