Fixed template usage