Fix/memc tracker