Fixed to_html