try to fix templates again