diff --git a/paket.dependencies b/paket.dependencies
index 5f84155..4601a3d 100755
--- a/paket.dependencies
+++ b/paket.dependencies
@@ -33,8 +33,8 @@ nuget Be.Vlaanderen.Basisregisters.Build.Pipeline 6.0.3
 
 nuget Be.Vlaanderen.Basisregisters.AggregateSource.SqlStreamStore.Autofac 6.0.0
 
-nuget Be.Vlaanderen.Basisregisters.EventHandling 4.0.0
-nuget Be.Vlaanderen.Basisregisters.EventHandling.Autofac 4.0.0
+nuget Be.Vlaanderen.Basisregisters.EventHandling 4.1.0
+nuget Be.Vlaanderen.Basisregisters.EventHandling.Autofac 4.1.0
 
 nuget Be.Vlaanderen.Basisregisters.EntityFrameworkCore.EntityTypeConfiguration 3.0.0
 
diff --git a/paket.lock b/paket.lock
index d164c84..8d02051 100644
--- a/paket.lock
+++ b/paket.lock
@@ -61,13 +61,13 @@ NUGET
       System.Data.Common (>= 4.3)
     Be.Vlaanderen.Basisregisters.EntityFrameworkCore.EntityTypeConfiguration (3.0)
       Microsoft.EntityFrameworkCore (>= 6.0.3)
-    Be.Vlaanderen.Basisregisters.EventHandling (4.0)
+    Be.Vlaanderen.Basisregisters.EventHandling (4.1)
       Be.Vlaanderen.Basisregisters.Converters.TrimString (>= 3.0)
       Newtonsoft.Json (>= 13.0.1)
       NodaTime.Serialization.JsonNet (>= 3.0)
-    Be.Vlaanderen.Basisregisters.EventHandling.Autofac (4.0)
+    Be.Vlaanderen.Basisregisters.EventHandling.Autofac (4.1)
       Autofac.Extensions.DependencyInjection (>= 7.2)
-      Be.Vlaanderen.Basisregisters.EventHandling (4.0)
+      Be.Vlaanderen.Basisregisters.EventHandling (4.1)
     Be.Vlaanderen.Basisregisters.Utilities.HashCodeCalculator (3.0)
     Be.Vlaanderen.Basisregisters.Utilities.HexByteConvertor (3.0)
     Be.Vlaanderen.Basisregisters.Utilities.ToStringBuilder (3.0)
diff --git a/src/Be.Vlaanderen.Basisregisters.ProjectionHandling.SqlStreamStore/Envelope.cs b/src/Be.Vlaanderen.Basisregisters.ProjectionHandling.SqlStreamStore/Envelope.cs
index 5b9f989..c82c9ba 100755
--- a/src/Be.Vlaanderen.Basisregisters.ProjectionHandling.SqlStreamStore/Envelope.cs
+++ b/src/Be.Vlaanderen.Basisregisters.ProjectionHandling.SqlStreamStore/Envelope.cs
@@ -5,8 +5,10 @@ namespace Be.Vlaanderen.Basisregisters.ProjectionHandling.SqlStreamStore
     using System.Collections.Generic;
     using System.Linq;
     using System.Linq.Expressions;
+    using EventHandling;
 
     public class Envelope<TMessage> // Used by handlers
+        where TMessage : IMessage
     {
         private readonly Envelope _envelope;
 
diff --git a/test/Be.Vlaanderen.Basisregisters.ProjectionHandling.Runner.Tests/RunnerTests.cs b/test/Be.Vlaanderen.Basisregisters.ProjectionHandling.Runner.Tests/RunnerTests.cs
index 3264a81..c0f4ecf 100755
--- a/test/Be.Vlaanderen.Basisregisters.ProjectionHandling.Runner.Tests/RunnerTests.cs
+++ b/test/Be.Vlaanderen.Basisregisters.ProjectionHandling.Runner.Tests/RunnerTests.cs
@@ -97,7 +97,7 @@ private Func<TestMessage, Task<AppendResult>> CreateMessageStorerAndStartHandlin
 
     [EventName("TestMessage")]
     [EventDescription("TestMessage description")]
-    public class TestMessage
+    public class TestMessage : IMessage
     {
         public int Id { get; set; }
     }