Fixed template changes