Fix of template