--- a/OrthancServer/OrthancMoveRequestHandler.cpp	Wed Nov 28 14:48:14 2018 +0100
+++ b/OrthancServer/OrthancMoveRequestHandler.cpp	Thu Nov 29 11:47:00 2018 +0100
@@ -34,7 +34,7 @@
 #include "PrecompiledHeadersServer.h"
 #include "OrthancMoveRequestHandler.h"
 
-#include "OrthancInitialization.h"
+#include "OrthancConfiguration.h"
 #include "../../Core/DicomParsing/FromDcmtkBridge.h"
 #include "../Core/DicomFormat/DicomArray.h"
 #include "../Core/Logging.h"
@@ -81,7 +81,10 @@
           instances_.push_back(*it);
         }
 
-        remote_ = Configuration::GetModalityUsingAet(targetAet);
+        {
+          OrthancConfiguration::ReaderLock lock;
+          remote_ = lock.GetConfiguration().GetModalityUsingAet(targetAet);
+        }
       }
 
       virtual unsigned int GetSubOperationCount() const
@@ -135,7 +138,11 @@
         job_->SetDescription("C-MOVE");
         job_->SetPermissive(true);
         job_->SetLocalAet(context.GetDefaultLocalApplicationEntityTitle());
-        job_->SetRemoteModality(Configuration::GetModalityUsingAet(targetAet));
+
+        {
+          OrthancConfiguration::ReaderLock lock;
+          job_->SetRemoteModality(lock.GetConfiguration().GetModalityUsingAet(targetAet));
+        }
 
         if (originatorId != 0)
         {
@@ -238,7 +245,12 @@
                                               const std::string& originatorAet,
                                               uint16_t originatorId)
   {
-    bool synchronous = Configuration::GetGlobalBoolParameter("SynchronousCMove", true);
+    bool synchronous;
+
+    {
+      OrthancConfiguration::ReaderLock lock;
+      synchronous = lock.GetConfiguration().GetBooleanParameter("SynchronousCMove", true);
+    }
 
     if (synchronous)
     {