diff --git a/src/output/invoice.js b/src/output/invoice.js
index b8c82fe..6ad80ba 100644
--- a/src/output/invoice.js
+++ b/src/output/invoice.js
@@ -66,7 +66,7 @@ class invoice extends Base {
         let city = this.config.get('invoiceSettings').from[3].substring(endOfZipPos + 1);
         
         // debitor
-        let nDebitorAddressFields = this.config.get('invoiceAddress').length;
+        let nDebitorAddressFields = Array.isArray(this.config.get('invoiceAddress'))? this.config.get('invoiceAddress').length: -1;
         let nameDebitor = "";
         let zipDebitor = "";
         let cityDebitor = "";
@@ -74,13 +74,19 @@ class invoice extends Base {
         let countryDebitor = "CH";
 
         if(nDebitorAddressFields > 0) {
-            nameDebitor = this.config.get('invoiceAddress') [0].replaceAll("_", " ");
+            nameDebitor = this.config.get('invoiceAddress') [0].replace("/_/g", " ");
         }
+        else {
+            nameDebitor = this.config.get('invoiceAddress').toString();
+        }
+
         if(nDebitorAddressFields > 2) {
             let endOfZipPosDebitor = this.config.get('invoiceAddress')[nDebitorAddressFields-1].search("[ _]");
-            zipDebitor = this.config.get('invoiceAddress')[nDebitorAddressFields-1].substring(0, endOfZipPosDebitor).replaceAll("_", " ");
-            cityDebitor = this.config.get('invoiceAddress')[nDebitorAddressFields-1].substring(endOfZipPosDebitor + 1).replaceAll("_", " ");
-            addressDebitor = this.config.get('invoiceAddress') [nDebitorAddressFields-2].replaceAll("_", " ");
+            if(endOfZipPosDebitor > 0){
+                zipDebitor = this.config.get('invoiceAddress')[nDebitorAddressFields-1].substring(0, endOfZipPosDebitor).replace("/_/g", " ");
+                cityDebitor = this.config.get('invoiceAddress')[nDebitorAddressFields-1].substring(endOfZipPosDebitor + 1).replace("/_/g", " ");
+            }
+            addressDebitor = this.config.get('invoiceAddress') [nDebitorAddressFields-2].replace("/_/g", " ");
             if(zipDebitor.search("-") > 0)
             {
                 let countryZip = zipDebitor.split("-");