fixed templating to support GH