Fix CommentSection