fix discussion bugs