Revert "Revert "fixes other tracks""

This reverts commit 1ddbb3905276576d39a791fefc77d6a0662d0371.
next try fixing it