Fix join/leave event