fix join flow