Added join on stop