Fixing HTML support