Fix templating Address