Attempt to fix tracker