VE-1178 Fix double tracking bug