diff --git a/Graphics/drawPost.cpp b/Graphics/drawPost.cpp
index ff7f9b3add70bf58562445ac3e3153ca2620c2b9..50afbb9b2727471f0862a02274a9aab04c92729c 100644
--- a/Graphics/drawPost.cpp
+++ b/Graphics/drawPost.cpp
@@ -256,6 +256,7 @@ static void drawGlyphs(drawContext *ctx, PView *p)
           data->getValue(opt->timeStep, ent, i, j, k, val[j][k]);
       }
       changeCoordinates(p, ent, i, numNodes, type, numComp, xyz, val);
+      if(!isElementVisible(opt, dim, numNodes, xyz)) continue;
       if(opt->intervalsType == PViewOptions::Numeric)
         drawNumberGlyphs(ctx, p, numNodes, numComp, xyz, val);
       if(dim == 2 && opt->normals)
diff --git a/Post/PView.h b/Post/PView.h
index c577b4c0c970283f911b9bd23d805a7bfcffe1ef..70a0259596ce70a59ad6b23d08f3c9be7f5287fa 100644
--- a/Post/PView.h
+++ b/Post/PView.h
@@ -132,5 +132,7 @@ class PView{
 void changeCoordinates(PView *p, int ient, int iele,
                        int numNodes, int type, int numComp, 
                        double xyz[PVIEW_NMAX][3], double val[PVIEW_NMAX][9]);
+bool isElementVisible(PViewOptions *opt, int dim, int numNodes, 
+                      double xyz[PVIEW_NMAX][3]);
 
 #endif
diff --git a/Post/PViewVertexArrays.cpp b/Post/PViewVertexArrays.cpp
index c212a9fa4b13b59732f0669ce2c28536eb6eff8e..567bd0fed6da2c1fb0707a4f4b49c6eb7434c7f8 100644
--- a/Post/PViewVertexArrays.cpp
+++ b/Post/PViewVertexArrays.cpp
@@ -265,8 +265,8 @@ static double intersectClipPlane(int clip, int numNodes, double xyz[PVIEW_NMAX][
   return val;
 }
 
-static bool isElementVisible(PViewOptions *opt, int dim, int numNodes, 
-                             double xyz[PVIEW_NMAX][3])
+bool isElementVisible(PViewOptions *opt, int dim, int numNodes, 
+                      double xyz[PVIEW_NMAX][3])
 {
   if(!CTX::instance()->clipWholeElements) return true;
   bool hidden = false;
diff --git a/doc/CREDITS.txt b/doc/CREDITS.txt
index b3b13dd9418e05ceb3f25e4bc6587c00d9d901c5..fe44f645697abd3ad2b933b952ba44662b4bc27d 100644
--- a/doc/CREDITS.txt
+++ b/doc/CREDITS.txt
@@ -121,4 +121,4 @@ Michel Benhamou, Tom De Vuyst, Kris Van den Abeele, Simon Vun, Simon
 Corbin, Thomas De-Soza, Marcus Drosson, Antoine Dechaume, Jose Paulo
 Moitinho de Almeida, Thomas Pinchard, Corrado Chisari, Axel Hackbarth,
 Peter Wainwright, Jiri Hnidek, Thierry Thomas, Konstantinos Poulios,
-Laurent Van Miegroet.
+Laurent Van Miegroet, Shahrokh Ghavamian.