Fix tracking bug