fixed corner cases with new mongo tracking