Fix join flow