Correcting the templates