diff --git a/lib/taskjuggler/Query.rb b/lib/taskjuggler/Query.rb
index 2026bae2..3a148c7f 100644
--- a/lib/taskjuggler/Query.rb
+++ b/lib/taskjuggler/Query.rb
@@ -154,7 +154,7 @@ def process
         end
 
         # Same for the scope property.
-        if !@scopeProperty.nil? && !@scopePropertyId.nil?
+        if @scopeProperty.nil? && !@scopePropertyId.nil?
           @scopeProperty = resolvePropertyId(@scopePropertyType,
                                              @scopePropertyId)
           unless @scopeProperty
diff --git a/lib/taskjuggler/TaskScenario.rb b/lib/taskjuggler/TaskScenario.rb
index d54b2d4c..33b1b8eb 100644
--- a/lib/taskjuggler/TaskScenario.rb
+++ b/lib/taskjuggler/TaskScenario.rb
@@ -1508,6 +1508,7 @@ def query_resources(query)
             end
             q = query.dup
             q.property = resource
+            q.scopeProperty = @property
             rti.setQuery(q)
             list << "<nowiki>#{rti.to_s}</nowiki>"
           else