TrackEncoder fix for Part 1 & 2, v1.

If I can get a r+ on Part 2, then I don't need to push another fix for this lol.