Tamplate fix