diff --git a/Plugin/ModifyComponent.cpp b/Plugin/ModifyComponent.cpp
index 01b0d623fd6d99a449394667b03e7f1a1a223073..3802181a3a9aa2566559c7c8e581e6de23395de1 100644
--- a/Plugin/ModifyComponent.cpp
+++ b/Plugin/ModifyComponent.cpp
@@ -175,11 +175,9 @@ PView *GMSH_ModifyComponentPlugin::execute(PView *view)
         int numComp2 = octree ? 9 : data2->getNumComponents(step2, ent, ele);
         int numNodes = data1->getNumNodes(step, ent, ele);
         std::vector<double> x(numNodes), y(numNodes), z(numNodes);
-        std::vector<int> tag(numNodes, 0.);
-        if(data1->isNodeData()){
-          for(int nod = 0; nod < numNodes; nod++)
-            tag[nod] = data1->getNode(step, ent, ele, nod, x[nod], y[nod], z[nod]);
-        }
+        std::vector<int> tag(numNodes);
+        for(int nod = 0; nod < numNodes; nod++)
+          tag[nod] = data1->getNode(step, ent, ele, nod, x[nod], y[nod], z[nod]);
         for(int nod = 0; nod < numNodes; nod++){
           if(data1->isNodeData() && tag[nod]) continue; // node has already been modified
           std::vector<double> v(std::max(9, numComp), 0.);
diff --git a/Plugin/Warp.cpp b/Plugin/Warp.cpp
index 56660690939c453c465761dfe31dd6d90ebf3cfc..d2c2d733e57864faf26b47592b1078eb6004d8a1 100644
--- a/Plugin/Warp.cpp
+++ b/Plugin/Warp.cpp
@@ -117,11 +117,9 @@ PView *GMSH_WarpPlugin::execute(PView *v)
         int numNodes = data1->getNumNodes(step, ent, ele);
         if(numNodes < 2) continue;
         double x[8], y[8], z[8], n[3] = {0., 0., 0.};
-        std::vector<int> tag(8, 0);
-        if(data1->isNodeData()){
-          for(int nod = 0; nod < numNodes; nod++)
-            tag[nod] = data1->getNode(step, ent, ele, nod, x[nod], y[nod], z[nod]);
-        }
+        int tag[8];
+        for(int nod = 0; nod < numNodes; nod++)
+          tag[nod] = data1->getNode(step, ent, ele, nod, x[nod], y[nod], z[nod]);
         int dim = data1->getDimension(step, ent, ele);
         if(normals && dim == 2)
           normal3points(x[0], y[0], z[0], x[1], y[1], z[1], x[2], y[2], z[2], n);