Fix markup (Revisited)