--- a/OrthancServer/Internals/FindScp.cpp	Thu Jun 30 08:20:23 2016 +0200
+++ b/OrthancServer/Internals/FindScp.cpp	Thu Jun 30 20:02:21 2016 +0200
@@ -103,6 +103,10 @@
       const std::string* remoteIp_;
       const std::string* remoteAet_;
       const std::string* calledAet_;
+
+      FindScpData() : answers_(false)
+      {
+      }
     };
 
 
@@ -132,6 +136,8 @@
         {
           if (sopClassUid == UID_FINDModalityWorklistInformationModel)
           {
+            data.answers_.SetWorklist(true);
+
             if (data.worklistHandler_ != NULL)
             {
               ParsedDicomFile query(*requestIdentifiers);
@@ -147,6 +153,8 @@
           }
           else
           {
+            data.answers_.SetWorklist(false);
+
             if (data.findHandler_ != NULL)
             {
               std::list<DicomTag> sequencesToReturn;