Fixed xhtml handling