diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index ea642c08..c5992e83 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/Source/bsmd.ExcelReadService/Util.cs b/nsw/Source/bsmd.ExcelReadService/Util.cs
index c5fd9ed7..47c2c205 100644
--- a/nsw/Source/bsmd.ExcelReadService/Util.cs
+++ b/nsw/Source/bsmd.ExcelReadService/Util.cs
@@ -2734,13 +2734,15 @@ namespace bsmd.ExcelReadService
         {            
             foreach(Message message in messages)            
                 if (message.MessageNotificationClass == type) return message;
-
-            Message newMessage = new Message();
-            newMessage.MessageNotificationClass = type;
-            messages.Add(newMessage);
-            newMessage.MessageCore = core;
-            newMessage.MessageCoreId = core.Id;
-
+            
+            Message newMessage = DBManager.Instance.GetMessage(core, type);
+            if (newMessage == null)
+            {
+                newMessage.MessageNotificationClass = type;
+                messages.Add(newMessage);
+                newMessage.MessageCore = core;
+                newMessage.MessageCoreId = core.Id;
+            }
             return newMessage;
         }
 
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
index 1117dbef..679d1d81 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("schick Informatik")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("3.9.6")]
+[assembly: AssemblyInformationalVersion("3.9.7")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2017 schick Informatik")]
 [assembly: AssemblyTrademark("")]
\ No newline at end of file
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
index af1776fd..679e2997 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.9.6.*")]
+[assembly: AssemblyVersion("3.9.7.*")]