Fix tracking issue