Fix bug on comments