bug fix on comments