Fix CME in n.m.s.EntityTracker