diff --git a/pytrustnfe/nfe/__init__.py b/pytrustnfe/nfe/__init__.py
index bf080c6..c3846ac 100644
--- a/pytrustnfe/nfe/__init__.py
+++ b/pytrustnfe/nfe/__init__.py
@@ -55,7 +55,8 @@ def _add_required_node(elemTree):
         cEan = etree.Element('cEAN')
         cEANTrib = etree.Element('cEANTrib')
         prod.insert(1, cEan)
-        prod.insert(9, cEANTrib)
+        vProd = prod.find('ns:vProd', namespaces = ns)
+        prod.insert(prod.index(vProd) + 1, cEANTrib)
     return elemTree
 
 
diff --git a/pytrustnfe/nfe/templates/NfeAutorizacao.xml b/pytrustnfe/nfe/templates/NfeAutorizacao.xml
index aaeefb5..8cd1fd2 100644
--- a/pytrustnfe/nfe/templates/NfeAutorizacao.xml
+++ b/pytrustnfe/nfe/templates/NfeAutorizacao.xml
@@ -16,7 +16,7 @@
                 <dhEmi>{{ ide.dhEmi }}</dhEmi>
                 <dhSaiEnt>{{ ide.dhSaiEnt }}</dhSaiEnt>
                 <tpNF>{{ ide.tpNF }}</tpNF>
-                <idDest>{{ ide.idDest }}</idDest>
+				<idDest>{{ ide.idDest }}</idDest>
                 <cMunFG>{{ ide.cMunFG }}</cMunFG>
                 <tpImp>{{ ide.tpImp }}</tpImp>
                 <tpEmis>{{ ide.tpEmis }}</tpEmis>
@@ -97,6 +97,7 @@
                 <CRT>{{ emit.CRT }}</CRT>
                 {% endwith %}
             </emit>
+			{% if dest is defined %}
             <dest>
                 {% with dest = NFe.infNFe.dest %}
                 {% if dest.tipo == 'person' -%}
@@ -124,7 +125,8 @@
                 <IM>{{ dest.IM }}</IM>
                 <email>{{ dest.email }}</email>
                 {% endwith %}
-            </dest>
+			</dest>
+			{% endif %}
             {% if NFe.infNFe.retirada is defined %}
             <retirada>
                 <CNPJ>{{ NFe.infNFe.retirada.CNPJ }}</CNPJ>