more fix on template again