Fixed markup, again