Fix bugs on comments