fix-tracking Internal tracking was incorrectly implemented, this fixes t...

...hat