Make nextPath a little less janky