Fix multiple join messages bug