Fix comment counting