CON-1797: Fix tracking