Fixed. More work on templates and auto.