Fix tpl and persist comment