Fixed & issue in xhtml. fixes #ORG-2201