fix multiple tracking issue