Fixed some "not tracking right now" logic