Fixed joining and leaving