diff --git a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/MessageBeanContainer.java b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/MessageBeanContainer.java
index 37ee49d0365..84f3c1952c2 100644
--- a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/MessageBeanContainer.java
+++ b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/MessageBeanContainer.java
@@ -216,7 +216,7 @@ public final class MessageBeanContainer extends BaseContainer implements Message
             messageBeanClient_ = clientFactory.createMessageBeanClient(msgBeanDesc);
 
             componentInvocation = createComponentInvocation();
-            componentInvocation.container = this;
+            componentInvocation.setContainer(this);
             invocationManager.preInvoke(componentInvocation);
             messageBeanClient_.setup(this);
 
@@ -1135,7 +1135,7 @@ public void beforeMessageDelivery(Method method, MessageDeliveryType deliveryTyp
             invocation.context = context;
             invocation.instance = context.getEJB();
             invocation.ejb = context.getEJB();
-            invocation.container = this;
+            invocation.setContainer(this);
 
             // Message Bean Container only starts a new transaction if
             // there is no imported transaction and the message listener