Attempting to fix join messages again