Remove bug from templates and added back