Fixed tracking issue