Move the space to the template?