diff --git a/ebill_paynet/messages/invoice-2013A-invocloud.xml b/ebill_paynet/messages/invoice-2013A-invocloud.xml
index 4d278da..e5c6cd6 100644
--- a/ebill_paynet/messages/invoice-2013A-invocloud.xml
+++ b/ebill_paynet/messages/invoice-2013A-invocloud.xml
@@ -17,17 +17,17 @@
       <MESSAGE-REFERENCE>
         <REFERENCE-DATE>
           <Reference-No>{{ invoice.name }}</Reference-No>
-          <Date>{{ format_date() }}</Date>
+          <Date>{{ format_date(invoice.invoice_date) }}</Date>
         </REFERENCE-DATE>
       </MESSAGE-REFERENCE>
       <PRINT-DATE>
-        <Date>{{ format_date(invoice.date_invoice) }}</Date>
+        <Date>{{ format_date(invoice.invoice_date) }}</Date>
       </PRINT-DATE>
       <REFERENCE>
         <INVOICE-REFERENCE>
           <REFERENCE-DATE>
             <Reference-No>{{ invoice.name }}</Reference-No>
-            <Date>{{ format_date(invoice.date_invoice) }}</Date>
+            <Date>{{ format_date(invoice.invoice_date) }}</Date>
           </REFERENCE-DATE>
         </INVOICE-REFERENCE>
       </REFERENCE>
@@ -121,7 +121,7 @@
     <PAYMENT-TERMS>
       <BASIC Payment-Type="{{ payment_type|upper }}" Terms-Type="5">
         <TERMS>
-          <Date>{{ format_date(invoice.date_due or invoice.date_invoice) }}</Date>
+          <Date>{{ format_date(invoice.invoice_date_due or invoice.invoice_date) }}</Date>
         </TERMS>
       </BASIC>
     </PAYMENT-TERMS>