diff --git a/src/Mod/Fem/App/AppFemPy.cpp b/src/Mod/Fem/App/AppFemPy.cpp
index b46b09488..d2a1a5ed5 100644
--- a/src/Mod/Fem/App/AppFemPy.cpp
+++ b/src/Mod/Fem/App/AppFemPy.cpp
@@ -64,8 +64,10 @@
 
 #include "FemMesh.h"
 #include "FemMeshObject.h"
-#include "FemPostPipeline.h"
 #include "FemMeshPy.h"
+#ifdef FC_USE_VTK
+#include "FemPostPipeline.h"
+#endif
 
 #include <cstdlib>
 
diff --git a/src/Mod/Fem/App/AppFemPy.cpp.orig b/src/Mod/Fem/App/AppFemPy.cpp.orig
index 8fa49efb5..e99a67f18 100644
--- a/src/Mod/Fem/App/AppFemPy.cpp.orig
+++ b/src/Mod/Fem/App/AppFemPy.cpp.orig
@@ -1,4 +1,4 @@
-<<<<<<< eec6f7aee8b6e5979a799358e2ae69bdc5a7af5b
+<<<<<<< 9049674212e3b4f1429e82bfa203304100632838
 /***************************************************************************
  *   Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de)              *
  *                                                                         *
@@ -188,6 +188,7 @@ private:
                 pcFeature->Label.setValue(file.fileNamePure().c_str());
                 pcFeature->read(file);
                 pcFeature->touch();
+                pcDoc->recomputeFeature(pcFeature);
             }
             else 
                 throw e;
@@ -330,8 +331,10 @@ PyObject* initModule()
 
 #include "FemMesh.h"
 #include "FemMeshObject.h"
-#include "FemPostPipeline.h"
 #include "FemMeshPy.h"
+#ifdef FC_USE_VTK
+#include "FemPostPipeline.h"
+#endif
 
 #include <cstdlib>
 
@@ -529,4 +532,4 @@ PyObject* initModule()
 }
 
 } // namespace Fem
->>>>>>> Basic implementation of filter framework
+>>>>>>> Fem Post: fix vtk include wthout guard