Fix markup (again...)