Fix extra no comments messages