diff --git a/Asterisk.2013/Asterisk.NET/Asterisk.NET.csproj b/Asterisk.2013/Asterisk.NET/Asterisk.NET.csproj
index ada0d3c..5c39438 100644
--- a/Asterisk.2013/Asterisk.NET/Asterisk.NET.csproj
+++ b/Asterisk.2013/Asterisk.NET/Asterisk.NET.csproj
@@ -316,6 +316,9 @@
     <Content Include="Manager\Documentation\Asterisk-1.6.2.24\AMI Commands.txt" />
     <Content Include="Manager\Documentation\Asterisk-1.6.2.24\AMI Events.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Manager\Documentation\Asterisk-1.8.x\" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Asterisk.2013/Asterisk.NET/Helper.cs b/Asterisk.2013/Asterisk.NET/Helper.cs
index 740778b..27bacd0 100644
--- a/Asterisk.2013/Asterisk.NET/Helper.cs
+++ b/Asterisk.2013/Asterisk.NET/Helper.cs
@@ -73,8 +73,10 @@ namespace Asterisk.NET
 			int delimiterIndex = actionId.IndexOf(Common.INTERNAL_ACTION_ID_DELIMITER);
 			if (delimiterIndex > 0)
 			{
-				if (actionId.Length > delimiterIndex + 1)
-					return actionId.Substring(delimiterIndex + 1).Trim();
+                if (actionId.Length > delimiterIndex + 1)
+                    return actionId.Substring(delimiterIndex + 1).Trim();
+                else
+                    return actionId.Substring(0, delimiterIndex).Trim();
 			}
 			return string.Empty;
 		}
diff --git a/Asterisk.2013/ChangeLog.txt b/Asterisk.2013/ChangeLog.txt
index 80dda3b..dc89651 100644
--- a/Asterisk.2013/ChangeLog.txt
+++ b/Asterisk.2013/ChangeLog.txt
@@ -1,3 +1,6 @@
+28.05.2013 (skrusty)
+	Fix Fixed issue with SendEventGeneratingAction, see work item: 1000 (https://asternet.codeplex.com/workitem/1000)
+
 03.04.2013 (skrusty)
 	Added direct support for Asterisk 1.8 in version Enum
 	Added documentation for events and actions in Asterisk 1.6.2.24 (last version in 1.6.2 branch)