fixing to work with HTML5-UI