diff --git a/source/app/controllers/pacs/cfdi_cert.py b/source/app/controllers/pacs/cfdi_cert.py
index e90ab57..90cdf36 100644
--- a/source/app/controllers/pacs/cfdi_cert.py
+++ b/source/app/controllers/pacs/cfdi_cert.py
@@ -175,12 +175,12 @@ class SATCertificate(object):
 
         node = xmlsec.tree.find_node(tree, 'X509Certificate')
         node.text = self.cer_txt
-        # ~ node = xmlsec.tree.find_node(tree, 'X509IssuerName')
-        # ~ node.text = self.issuer
+        node = xmlsec.tree.find_node(tree, 'X509IssuerName')
+        node.text = self.issuer
         node = xmlsec.tree.find_node(tree, 'X509SerialNumber')
         node.text = self.serial_number
-        # ~ node = xmlsec.tree.find_node(tree, 'SignatureValue')
-        # ~ node.text = node.text.replace('\n', '')
+        node = xmlsec.tree.find_node(tree, 'SignatureValue')
+        node.text = node.text.replace('\n', '')
         # ~ node = xmlsec.tree.find_node(tree, 'Modulus')
         # ~ node.text = node.text.replace('\n', '')
 
diff --git a/source/app/controllers/pacs/comerciodigital/comercio.py b/source/app/controllers/pacs/comerciodigital/comercio.py
index d2bdf42..88be17d 100644
--- a/source/app/controllers/pacs/comerciodigital/comercio.py
+++ b/source/app/controllers/pacs/comerciodigital/comercio.py
@@ -110,6 +110,10 @@ class PACComercioDigital(object):
         headers['Connection'] = 'Keep-Alive'
         headers['Expect'] = '100-continue'
 
+        req = requests.Request('POST', url, headers=headers, data=data)
+        prepared = req.prepare()
+        pretty_print_POST(prepared)
+
         try:
             result = requests.post(url, data=data, headers=headers, timeout=TIMEOUT)
         except ConnectionError as e:
@@ -269,11 +273,6 @@ class PACComercioDigital(object):
 
         url = self.URL['cancelxml']
         headers = self._get_headers_cancel_xml(cfdi, info, auth)
-
-        req = requests.Request('POST', url, headers=headers, data=xml)
-        prepared = req.prepare()
-        pretty_print_POST(prepared)
-
         result = self._post(url, xml, headers)
 
         if result is None:
diff --git a/source/app/settings.py b/source/app/settings.py
index bc1d03c..28e0ce5 100644
--- a/source/app/settings.py
+++ b/source/app/settings.py
@@ -293,4 +293,5 @@ DEFAULT_GLOBAL = {
 # ~ </Cancelacion>
 # ~ </CancelaCFD>"""
 
-TEMPLATE_CANCEL = """<CancelaCFD xmlns="http://cancelacfd.sat.gob.mx"><Cancelacion xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" RfcEmisor="{rfc}" Fecha="{fecha}"><Folios><Folio UUID="{uuid}" Motivo="{motivo}"{folio}/></Folios><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue/></Reference></SignedInfo><SignatureValue/><KeyInfo><X509Data><X509IssuerSerial><X509IssuerName/><X509SerialNumber/></X509IssuerSerial><X509Certificate/></X509Data><KeyValue><RSAKeyValue><Modulus/><Exponent/></RSAKeyValue></KeyValue></KeyInfo></Signature></Cancelacion></CancelaCFD>"""
+# ~ TEMPLATE_CANCEL = """<CancelaCFD xmlns="http://cancelacfd.sat.gob.mx"><Cancelacion xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" RfcEmisor="{rfc}" Fecha="{fecha}"><Folios><Folio UUID="{uuid}" Motivo="{motivo}"{folio}/></Folios><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue/></Reference></SignedInfo><SignatureValue/><KeyInfo><X509Data><X509IssuerSerial><X509IssuerName/><X509SerialNumber/></X509IssuerSerial><X509Certificate/></X509Data><KeyValue><RSAKeyValue><Modulus/><Exponent/></RSAKeyValue></KeyValue></KeyInfo></Signature></Cancelacion></CancelaCFD>"""
+TEMPLATE_CANCEL = """<CancelaCFD xmlns="http://cancelacfd.sat.gob.mx"><Cancelacion xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" RfcEmisor="{rfc}" Fecha="{fecha}"><Folios><Folio UUID="{uuid}" Motivo="{motivo}"{folio}/></Folios><Signature xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" /><DigestValue/></Reference></SignedInfo><SignatureValue/><KeyInfo><X509Data><X509IssuerSerial><X509IssuerName/><X509SerialNumber/></X509IssuerSerial><X509Certificate/></X509Data></KeyInfo></Signature></Cancelacion></CancelaCFD>"""