Light fix of template