fix tracking bug