diff --git a/CEP/BB/BBS/src/MNS/MeqExpr.cc b/CEP/BB/BBS/src/MNS/MeqExpr.cc
index bd0d29c78ef9be5e8bd7fc99a301ca66ea2f3c9e..2a74f2ee13f61b8de73c631248f6deab06815a12 100644
--- a/CEP/BB/BBS/src/MNS/MeqExpr.cc
+++ b/CEP/BB/BBS/src/MNS/MeqExpr.cc
@@ -155,7 +155,7 @@ MeqMatrix MeqExprRep::getResultValue (const vector<const MeqMatrix*>&)
 MeqResult MeqExprRep::getResult (const MeqRequest& request)
 {
   // Calculate the result in a generic way.
-  MeqResult result;
+  MeqResult result(request.nspid());
   // First evaluate all children and keep their results.
   // Also keep the main value.
   int nrchild = itsChildren.size();
diff --git a/CEP/BB/BBS/src/MNS/MeqExpr.h b/CEP/BB/BBS/src/MNS/MeqExpr.h
index 2b4723cd17f99d942092fff7450b88647c47de62..2b7f8438120ed3cd35e0d59123118e062fc3b02e 100644
--- a/CEP/BB/BBS/src/MNS/MeqExpr.h
+++ b/CEP/BB/BBS/src/MNS/MeqExpr.h
@@ -20,7 +20,7 @@
 //#
 //# $Id$
 
-#if !defined(MNS_MEQEXPR_H)
+#ifndef MNS_MEQEXPR_H
 #define MNS_MEQEXPR_H
 
 // \file
diff --git a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqExpr.h b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqExpr.h
index 2b4723cd17f99d942092fff7450b88647c47de62..2b7f8438120ed3cd35e0d59123118e062fc3b02e 100644
--- a/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqExpr.h
+++ b/CEP/BB/BBSKernel/include/BBSKernel/MNS/MeqExpr.h
@@ -20,7 +20,7 @@
 //#
 //# $Id$
 
-#if !defined(MNS_MEQEXPR_H)
+#ifndef MNS_MEQEXPR_H
 #define MNS_MEQEXPR_H
 
 // \file
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqExpr.cc b/CEP/BB/BBSKernel/src/MNS/MeqExpr.cc
index bd0d29c78ef9be5e8bd7fc99a301ca66ea2f3c9e..2a74f2ee13f61b8de73c631248f6deab06815a12 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqExpr.cc
+++ b/CEP/BB/BBSKernel/src/MNS/MeqExpr.cc
@@ -155,7 +155,7 @@ MeqMatrix MeqExprRep::getResultValue (const vector<const MeqMatrix*>&)
 MeqResult MeqExprRep::getResult (const MeqRequest& request)
 {
   // Calculate the result in a generic way.
-  MeqResult result;
+  MeqResult result(request.nspid());
   // First evaluate all children and keep their results.
   // Also keep the main value.
   int nrchild = itsChildren.size();
diff --git a/CEP/BB/BBSKernel/src/MNS/MeqExpr.h b/CEP/BB/BBSKernel/src/MNS/MeqExpr.h
index 2b4723cd17f99d942092fff7450b88647c47de62..2b7f8438120ed3cd35e0d59123118e062fc3b02e 100644
--- a/CEP/BB/BBSKernel/src/MNS/MeqExpr.h
+++ b/CEP/BB/BBSKernel/src/MNS/MeqExpr.h
@@ -20,7 +20,7 @@
 //#
 //# $Id$
 
-#if !defined(MNS_MEQEXPR_H)
+#ifndef MNS_MEQEXPR_H
 #define MNS_MEQEXPR_H
 
 // \file