fixing template duplication