Add solution for #11838 Come and Go