comments bug fix