diff --git a/ndb/include/kernel/signaldata/SumaImpl.hpp b/ndb/include/kernel/signaldata/SumaImpl.hpp
index 89ade067dcd..75fb65e1ad2 100644
--- a/ndb/include/kernel/signaldata/SumaImpl.hpp
+++ b/ndb/include/kernel/signaldata/SumaImpl.hpp
@@ -592,11 +592,11 @@ public:
   
   Uint32 subscriptionId;
   Uint32 subscriptionKey;
-  Uint32 err;
   union { // Haven't decide what to call it
     Uint32 senderData;
     Uint32 subscriberData;
   };
+  Uint32 err;
 };
 
 class SumaStartMe {
diff --git a/ndb/src/ndbapi/NdbEventOperationImpl.cpp b/ndb/src/ndbapi/NdbEventOperationImpl.cpp
index 657c2a84417..b00b0d82cba 100644
--- a/ndb/src/ndbapi/NdbEventOperationImpl.cpp
+++ b/ndb/src/ndbapi/NdbEventOperationImpl.cpp
@@ -84,6 +84,8 @@ NdbEventOperationImpl::NdbEventOperationImpl(NdbEventOperation &N,
 
   m_eventImpl = &myEvnt->m_impl;
 
+  m_eventId = m_eventImpl->m_eventId;
+
   m_bufferHandle = m_ndb->getGlobalEventBufferHandle();
   if (m_bufferHandle->m_bufferL > 0) 
     m_bufferL =m_bufferHandle->m_bufferL;
@@ -947,6 +949,7 @@ NdbGlobalEventBuffer::real_prepareAddSubscribeEvent
   int bufferId= -1;
   Uint32 eventId= eventOp->m_eventId;
 
+  DBUG_PRINT("enter",("eventId: %u", eventId));
   //  add_drop_lock(); // only one thread can do add or drop at a time
 
   // Find place where eventId already set