diff --git a/Post/PViewDataRemote.h b/Post/PViewDataRemote.h
index 69df8c7f17177f467926d414a4eeca7751f31de3..0c81c9e18baec1d7e0925ff991ea894918426a32 100644
--- a/Post/PViewDataRemote.h
+++ b/Post/PViewDataRemote.h
@@ -69,7 +69,7 @@ class PViewDataRemote : public PViewData {
     setDirty(true);
     std::string fileName = CTX::instance()->homeDir + CTX::instance()->tmpFileName;
     // FIXME: until we rewrite the option code and allow nice serialization ;-)
-    PrintOptions(0, GMSH_FULLRC, 1, 0, fileName.c_str());
+    PrintOptions(0, GMSH_FULLRC, 0, 0, fileName.c_str());
     std::string options = ConvertFileToString(fileName);
     server->SendString(GmshSocket::GMSH_PARSE_STRING, options.c_str());
     server->SendString(GmshSocket::GMSH_VERTEX_ARRAY, "Send the vertex arrays!");
diff --git a/Post/PViewVertexArrays.cpp b/Post/PViewVertexArrays.cpp
index 494eecb0d947e9cb427ac18261327c934defcd60..112f6147b9cb94e4f3b293bc1f773000311e3861 100644
--- a/Post/PViewVertexArrays.cpp
+++ b/Post/PViewVertexArrays.cpp
@@ -1067,6 +1067,9 @@ class initPView {
 
     if(data->getDirty() || !data->getNumTimeSteps() || !p->getChanged()) return;
     if(!opt->visible || opt->type != PViewOptions::Plot3D) return;
+
+    p->deleteVertexArrays();
+
     if(data->fillRemoteVertexArrays()) return;
 
     if(opt->useGenRaise) opt->createGeneralRaise();
@@ -1086,7 +1089,6 @@ class initPView {
       opt->tmpMax = data->getMax();
     }
 
-    p->deleteVertexArrays();
     p->va_points = new VertexArray(1, _estimateNumPoints(p));
     p->va_lines = new VertexArray(2, _estimateNumLines(p));
     p->va_triangles = new VertexArray(3, _estimateNumTriangles(p));