fixing discussion regressions
Merge pull request #6197 from guardian/discussion-fix

fixing discussion regressions