diff --git a/src/OpenFOAM/fields/cloud/cloud.C b/src/OpenFOAM/fields/cloud/cloud.C
index 2bf9a518a4..40eb070bcd 100644
--- a/src/OpenFOAM/fields/cloud/cloud.C
+++ b/src/OpenFOAM/fields/cloud/cloud.C
@@ -49,20 +49,7 @@ Foam::cloud::cloud(const objectRegistry& obr, const word& cloudName)
             IOobject::AUTO_WRITE
         )
     )
-{
-    if (isA<polyMesh>(obr))
-    {
-        if (debug)
-        {
-            Pout<< "cloud: Initialising polyMesh nGeometricD" << endl;
-        }
-
-        // initialise mesh dimensions - needed for parallel runs
-        // due to lazy evaluation of valid mesh dimensions
-        const polyMesh& mesh = dynamic_cast<const polyMesh&>(obr);
-        const_cast<polyMesh&>(mesh).nGeometricD();
-    }
-}
+{}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index da7ffdc266..9891c79e5b 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -309,6 +309,9 @@ Foam::polyMesh::polyMesh(const IOobject& io)
         WarningIn("polyMesh(const IOobject&)")
             << "no cells in mesh" << endl;
     }
+
+    // Initialise demand-driven data
+    calcDirections();
 }