merge fix on the HTML too