fix tracking system