Fixed join and leave