Second attempt at fixing join messages