comment feature bug fix