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

...hat
I think we are using something like this in more places, candidate for abstracting away.