fixed some changed tracking edge cases