diff --git a/src/modules-core/workflow/java/test/org/apache/lenya/cms/workflow/WorkflowTest.java b/src/impl/test/org/apache/lenya/cms/workflow/WorkflowTest.java
similarity index 100%
rename from src/modules-core/workflow/java/test/org/apache/lenya/cms/workflow/WorkflowTest.java
rename to src/impl/test/org/apache/lenya/cms/workflow/WorkflowTest.java
diff --git a/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java b/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java
index 0969adc..927f51d 100644
--- a/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java
+++ b/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java
@@ -410,7 +410,7 @@
         Message message = new Message(subject, body, sender, recipients);
 
         NotificationEventDescriptor descriptor = new NotificationEventDescriptor(message);
-        RepositoryEvent event = RepositoryEventFactory.createEvent(this.manager, liveVersion,
+        RepositoryEvent event = RepositoryEventFactory.createEvent(this.manager, getSession(),
                 getLogger(), descriptor);
         getSession().enqueueEvent(event);
     }