Fixed template hierarchy.