FIX: bugs tmpl