join/leave fix