Fixed join/leave issue hopefully.