fixed templating issues