Fix problem with html encoding