Repaired templates