Last fix of HTML visitor