Fix _Local tracking