diff --git a/app/controllers/graphs_controller.rb b/app/controllers/graphs_controller.rb
index 2d0de20..93c1bd1 100644
--- a/app/controllers/graphs_controller.rb
+++ b/app/controllers/graphs_controller.rb
@@ -104,8 +104,7 @@ class GraphsController < ApplicationController
         sql << " WHERE (%s)" % Project.allowed_to_condition(User.current, :view_issues)
         unless @project.nil?
             sql << " AND (project_id = #{@project.id}"
-            sql << "    OR project_id IN (%s)" % @project.active_children.collect { |p| p.id }.join(',') unless @project.active_children.empty?
-            sql << " )"
+            sql << "    OR #{@project.project_condition(true)})"
         end 
         sql << " GROUP BY project_id"
         sql << " ORDER BY issue_count DESC"
@@ -267,9 +266,7 @@ class GraphsController < ApplicationController
     def confirm_issues_exist
         find_optional_project
         if !@project.nil?
-            ids = [@project.id]
-            ids += @project.active_children.collect(&:id)
-            @issues = Issue.find(:first, :include => [:project], :conditions => ["#{Project.table_name}.id IN (?)", ids])
+            @issues = Issue.find(:first, :include => [:project], :conditions => ["#{@project.project_condition(true)}"])
         else
             @issues = Issue.find(:first)
         end