diff --git a/openmc/lib/mesh.py b/openmc/lib/mesh.py
index 92684ec8db..90db09397a 100644
--- a/openmc/lib/mesh.py
+++ b/openmc/lib/mesh.py
@@ -103,7 +103,7 @@ class Mesh(_FortranObjectWithID):
         _dll.openmc_mesh_set_id(self._index, mesh_id)
 
 
-class RegularMesh(_FortranObjectWithID):
+class RegularMesh(Mesh):
     """RegularMesh stored internally.
 
     This class exposes a mesh that is stored internally in the OpenMC
diff --git a/src/cmfd_solver.cpp b/src/cmfd_solver.cpp
index 98ba0f6b4e..ab6283662c 100644
--- a/src/cmfd_solver.cpp
+++ b/src/cmfd_solver.cpp
@@ -40,7 +40,7 @@ xt::xtensor<int, 2> indexmap;
 
 int use_all_threads;
 
-RegularMesh* mesh;
+StructuredMesh* mesh;
 
 std::vector<double> egrid;
 
@@ -222,7 +222,7 @@ void openmc_initialize_mesh_egrid(const int meshtally_id, const int* cmfd_indice
   openmc_mesh_filter_get_mesh(meshfilter_index, &mesh_index);
 
   // Get mesh from mesh index
-  cmfd::mesh = get_regular_mesh(mesh_index);
+  cmfd::mesh = dynamic_cast<StructuredMesh*>(model::meshes[mesh_index].get());
 
   // Get energy bins from energy index, otherwise use default
   if (energy_index != -1) {