Fix the post join yet again