Fixed template issue