Index: src/main/groovy/com/lemans/builders/CommercialInvoiceBuilder.groovy
===================================================================
diff -u -ra6dd15c6ee4ffd9a2c3c6ecf872919e5341b0834 -r984587b2cd1757a2ada5ab794b8abf76f347ae42
--- src/main/groovy/com/lemans/builders/CommercialInvoiceBuilder.groovy	(.../CommercialInvoiceBuilder.groovy)	(revision a6dd15c6ee4ffd9a2c3c6ecf872919e5341b0834)
+++ src/main/groovy/com/lemans/builders/CommercialInvoiceBuilder.groovy	(.../CommercialInvoiceBuilder.groovy)	(revision 984587b2cd1757a2ada5ab794b8abf76f347ae42)
@@ -345,11 +345,11 @@
         innerAT2.addCell(cellAT3)
         PdfPCell cellAT4
         cellAT4 = new PdfPCell()
-        if (header?.extraSoldToAddressLine) { cellAT4.addElement(new Paragraph(header?.extraSoldToAddressLine?.toString(), new Font(Font.FontFamily.HELVETICA, 7, Font.NORMAL))) }
         cellAT4.addElement(new Paragraph(header?.soldTo?.toString(), new Font(Font.FontFamily.HELVETICA, 7, Font.NORMAL)))
         cellAT4.addElement(new Paragraph(header?.soldToAddressLine1?.toString(), new Font(Font.FontFamily.HELVETICA, 7, Font.NORMAL)))
         if (header?.soldToAddressLine2) { cellAT4.addElement(new Paragraph(header?.soldToAddressLine2?.toString(), new Font(Font.FontFamily.HELVETICA, 7, Font.NORMAL))) }
         cellAT4.addElement(new Paragraph("${header?.soldToCity} ${header?.soldToState} ${header?.soldToPostalCode}, ${header?.soldToCountryName}", new Font(Font.FontFamily.HELVETICA, 7, Font.NORMAL)))
+        if (header?.extraSoldToAddressLine) { cellAT4.addElement(new Paragraph(header?.extraSoldToAddressLine?.toString(), new Font(Font.FontFamily.HELVETICA, 7, Font.NORMAL))) }
         cellAT4.setBorder(0)
         innerAT2.addCell(cellAT4)
         addressTable.addCell(innerAT2)
@@ -376,19 +376,18 @@
         PdfPCell cellAT2
         cellAT2 = new PdfPCell()
         if (header?.forwarderAddressLine1) {
-            if (header?.extraShipToAddressLine) { cellAT4.addElement(new Paragraph(header?.extraShipToAddressLine?.toString(), new Font(Font.FontFamily.HELVETICA, 7, Font.NORMAL))) }
             cellAT2.addElement(new Paragraph(header?.forwardTo?.toString(), new Font(Font.FontFamily.HELVETICA, 7, Font.NORMAL)))
             cellAT2.addElement(new Paragraph(header?.forwarderAddressLine1?.toString(), new Font(Font.FontFamily.HELVETICA, 7, Font.NORMAL)))
             if (header?.forwarderAddressLine2) { cellAT2.addElement(new Paragraph(header?.forwarderAddressLine2?.toString(), new Font(Font.FontFamily.HELVETICA, 7, Font.NORMAL))) }
             cellAT2.addElement(new Paragraph("${header?.forwarderCity} ${header?.forwarderState} ${header?.forwarderPostalcode}, ${header?.forwarderCountryName} ", new Font(Font.FontFamily.HELVETICA, 7, Font.NORMAL)))
 
         } else {
-            if (header?.extraShipToAddressLine) { cellAT4.addElement(new Paragraph(header?.extraShipToAddressLine?.toString(), new Font(Font.FontFamily.HELVETICA, 7, Font.NORMAL))) }
             cellAT2.addElement(new Paragraph(header?.shipTo?.toString(), new Font(Font.FontFamily.HELVETICA, 7, Font.NORMAL)))
             cellAT2.addElement(new Paragraph(header?.shipToAddressLine1?.toString(), new Font(Font.FontFamily.HELVETICA, 7, Font.NORMAL)))
             if (header?.shipToAddressLine2) { cellAT2.addElement(new Paragraph(header?.shipToAddressLine2?.toString(), new Font(Font.FontFamily.HELVETICA, 7, Font.NORMAL))) }
             cellAT2.addElement(new Paragraph("${header?.shipToCity} ${header?.shipToState} ${header?.shipToPostalCode}, ${header?.shipToCountryName}", new Font(Font.FontFamily.HELVETICA, 7, Font.NORMAL)))
         }
+        if (header?.extraShipToAddressLine) { cellAT4.addElement(new Paragraph(header?.extraShipToAddressLine?.toString(), new Font(Font.FontFamily.HELVETICA, 7, Font.NORMAL))) }
         cellAT2.setBorder(0)
         innerAT1.addCell(cellAT2)
         addressTable.addCell(innerAT1)