Can we fix both templates then? It can be via a gist.