Attempt to fix Discussions 2