diff --git a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C
index bf30398b9..c17819b41 100644
--- a/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C
+++ b/src/rigidBodyDynamics/rigidBodyModelState/rigidBodyModelStateIO.C
@@ -76,7 +76,7 @@ Foam::Ostream& Foam::RBD::operator<<
     const rigidBodyModelState& state
 )
 {
-    os  << token::SPACE << state.q_
+    os  << state.q_
         << token::SPACE << state.qDot_
         << token::SPACE << state.qDdot_
         << token::SPACE << state.deltaT_;
diff --git a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
index d6bf0ffbe..30ad316f6 100644
--- a/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
+++ b/src/rigidBodyDynamics/rigidBodyMotion/rigidBodyMotion.C
@@ -59,7 +59,7 @@ Foam::RBD::rigidBodyMotion::rigidBodyMotion
 )
 :
     rigidBodyModel(dict),
-    motionState_(*this),
+    motionState_(*this, dict),
     motionState0_(motionState_),
     X00_(X0_.size()),
     aRelax_(dict.lookupOrDefault<scalar>("accelerationRelaxation", 1.0)),
@@ -67,6 +67,11 @@ Foam::RBD::rigidBodyMotion::rigidBodyMotion
     report_(dict.lookupOrDefault<Switch>("report", false)),
     solver_(rigidBodySolver::New(*this, dict.subDict("solver")))
 {
+    if (dict.found("g"))
+    {
+        g() = vector(dict.lookup("g"));
+    }
+
     initialize();
 }
 
@@ -86,6 +91,11 @@ Foam::RBD::rigidBodyMotion::rigidBodyMotion
     report_(dict.lookupOrDefault<Switch>("report", false)),
     solver_(rigidBodySolver::New(*this, dict.subDict("solver")))
 {
+    if (dict.found("g"))
+    {
+        g() = vector(dict.lookup("g"));
+    }
+
     initialize();
 }
 
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
index a770c7ced..f114cfc6b 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion.C
@@ -221,18 +221,11 @@ void Foam::rigidBodyMeshMotion::solve()
         curTimeIndex_ = this->db().time().timeIndex();
     }
 
-    dimensionedVector g("g", dimAcceleration, Zero);
-
     if (db().foundObject<uniformDimensionedVectorField>("g"))
     {
-        g = db().lookupObject<uniformDimensionedVectorField>("g");
+        model_.g() =
+            db().lookupObject<uniformDimensionedVectorField>("g").value();
     }
-    else if (coeffDict().found("g"))
-    {
-        coeffDict().lookup("g") >> g;
-    }
-
-    model_.g() = g.value();
 
     if (test_)
     {