solved bugs on comments