Attemt to fix tracking usage.