bug fix on the comment feature