fix issue of comments