Fix for serialization error for EventStore. Need more work.