fix tracking