Fixed issues with joining.