removed template bug