Fix support for HTML5