Fix case where initial node isn't considered current when it hasn't been left after entering/exiting an overlapping node