Fix bug & html comment