Fix race condition on final tracking call