Fixed tracking memory consumption