Trying to fix sorting by track#