diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index c3ace0e9..c17a40aa 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -37,7 +37,7 @@
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>6.9.7.0</ApplicationVersion>
+    <ApplicationVersion>6.9.8.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/SendNSWMessageService/NSWSendService.cs b/SendNSWMessageService/NSWSendService.cs
index a28c27b0..3755748c 100644
--- a/SendNSWMessageService/NSWSendService.cs
+++ b/SendNSWMessageService/NSWSendService.cs
@@ -168,10 +168,10 @@ namespace SendNSWMessageService
                         try
                         {
                             bool sendSucceeded = false;
+                            if(message.HIS == Message.NSWProvider.UNDEFINED)
+                                message.HIS = core.InitialHIS;
 
-                            message.HIS = core.InitialHIS;
-                            _log.InfoFormat("Sending {0} message to {1}",
-                                message.MessageNotificationClass.ToString(), message.HIS.ToString());
+                            _log.InfoFormat("Sending {0} message to {1}", message.MessageNotificationClass.ToString(), message.HIS.ToString());
                             
                             // switch über passendes HIS / Schnittstelle
                             switch (message.HIS)
diff --git a/bsmd.database/Properties/AssemblyProductInfo.cs b/bsmd.database/Properties/AssemblyProductInfo.cs
index 44700af9..baff66af 100644
--- a/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("schick Informatik")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("6.9.7")]
+[assembly: AssemblyInformationalVersion("6.9.8")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2021 schick Informatik")]
 [assembly: AssemblyTrademark("")]
\ No newline at end of file
diff --git a/bsmd.database/Properties/AssemblyProjectInfo.cs b/bsmd.database/Properties/AssemblyProjectInfo.cs
index 4a6af72d..c0f4cc37 100644
--- a/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("6.9.7.*")]
+[assembly: AssemblyVersion("6.9.8.*")]
 
diff --git a/bsmd.hisnord/Response.cs b/bsmd.hisnord/Response.cs
index 0b40b6da..85b2732f 100644
--- a/bsmd.hisnord/Response.cs
+++ b/bsmd.hisnord/Response.cs
@@ -257,7 +257,7 @@ namespace bsmd.hisnord
                                                 if (aMessage.InternalStatus == Message.BSMDStatus.SENT)
                                                 {
                                                     aMessageStillInSENTstate = true;
-                                                    _log.InfoFormat("message {0} still in SENT state", aMessage.Id);
+                                                    _log.InfoFormat("message {0} {1} still in SENT state", aMessage.Id, aMessage.MessageNotificationClassDisplay);
                                                 }
 
                                             }
diff --git a/misc/Reference_Sheet_DE.xlsx b/misc/Reference_Sheet_DE.xlsx
index c5478b76..21afd5dc 100644
Binary files a/misc/Reference_Sheet_DE.xlsx and b/misc/Reference_Sheet_DE.xlsx differ