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

...hat
consider better type than `any`