Fixed template problem