Fix new markup