fixed templating again