fixed template changing