Definitely visit in return

@mindmoon