#519 adding "find" immediately after visit