Fixed variable substitution
Markup changed