diff --git a/dune/gfe/parallel/globalp2mapper.hh b/dune/gfe/parallel/globalp2mapper.hh
index 6186147c8b4c4dff221fdf9478a3fafc0375c5a4..1202b03a837428cf46354adbbd3dfce89d7729dd 100644
--- a/dune/gfe/parallel/globalp2mapper.hh
+++ b/dune/gfe/parallel/globalp2mapper.hh
@@ -55,10 +55,11 @@ namespace Dune {
         {
 #if DUNE_VERSION_NEWER(DUNE_GRID,2,4)
           int localIndex  = p2Mapper_.subIndex(*it, i, 2);
+          int globalIndex = globalVertexIndex.index(it->template subEntity<2>(i));
 #else
           int localIndex  = p2Mapper_.map(*it, i, 2);
-#endif
           int globalIndex = globalVertexIndex.index(*it->template subEntity<2>(i));
+#endif
 
           localGlobalMap_[localIndex]  = globalIndex;
         }