Fix free tracking issue