diff --git a/mktxp/cli/output/dhcp_out.py b/mktxp/cli/output/dhcp_out.py
index a5f0961..1f6d55f 100644
--- a/mktxp/cli/output/dhcp_out.py
+++ b/mktxp/cli/output/dhcp_out.py
@@ -29,12 +29,14 @@ class DHCPOutput:
 
         dhcp_by_server = {}
         for dhcp_lease_record in sorted(dhcp_lease_records, key = lambda dhcp_record: dhcp_record['active_address'], reverse=True):
-            server = dhcp_lease_record['server']
+            server = dhcp_lease_record.get('server', 'all')
+            if server == 'all':
+                dhcp_lease_record['server'] = server
             if server in dhcp_by_server.keys():
                 dhcp_by_server[server].append(dhcp_lease_record)
             else:
                 dhcp_by_server[server] = [dhcp_lease_record]         
-        
+
         output_records = 0
         lease_records = len(dhcp_lease_records)        
         output_entry = BaseOutputProcessor.OutputDHCPEntry
diff --git a/setup.py b/setup.py
index c5a82ad..8768b22 100755
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ with open(path.join(pkg_dir, 'README.md'), encoding='utf-8') as f:
 
 setup(
     name='mktxp',
-    version='0.37',
+    version='0.38',
 
     url='https://github.com/akpw/mktxp',