diff --git a/dumux/assembly/fvassembler.hh b/dumux/assembly/fvassembler.hh
index 10765e8b96df5b48c0a22641be1ba6643cc42bbf..09f77129a3316611adbdd3b85211da7f6b085d3e 100644
--- a/dumux/assembly/fvassembler.hh
+++ b/dumux/assembly/fvassembler.hh
@@ -96,7 +96,7 @@ public:
      */
     [[deprecated("Please use constructor taking the previous solution instead. Will be removed after release 3.2!")]]
     FVAssembler(std::shared_ptr<const Problem> problem,
-                std::shared_ptr<const FVGridGeometry> fvGridGeometry,
+                std::shared_ptr<const GridGeometry> gridGeometry,
                 std::shared_ptr<GridVariables> gridVariables,
                 std::shared_ptr<const TimeLoop> timeLoop)
     : problem_(problem)
diff --git a/dumux/common/properties.hh b/dumux/common/properties.hh
index a61b16a2c0a7330ef3b4dbe92068ae07a29786f5..db26f13e769552d2bb3e72b492740a403f9ab980 100644
--- a/dumux/common/properties.hh
+++ b/dumux/common/properties.hh
@@ -127,6 +127,9 @@ template<class TypeTag, class MyTypeTag>
 struct GridGeometry { using type = GetPropType<TypeTag, Properties::FVGridGeometry>;  };       //!< The type of the global finite volume geometry
 #pragma GCC diagnostic pop
 
+template<class TypeTag, class MyTypeTag>
+struct GridGeometry { using type = GetPropType<TypeTag, Properties::FVGridGeometry>;  };       //!< The type of the global finite volume geometry
+
 template<class TypeTag, class MyTypeTag>
 struct EnableFVGridGeometryCache { using type = UndefinedProperty; };           //!< specifies if geometric data is saved (faster, but more memory consuming)