Attempt to fix join messages