Fix comment issue for discussions