Fixing component template;