Fixed template tracking