Minor template improvement