Fix tracking UInt/Int bug