VID-1616 fix tracking