Fixed a situation where paths might have gotten lost of more than one expansion was needed.