diff --git a/app/models/custom_workflow.rb b/app/models/custom_workflow.rb
index 089e6cf..6be00cf 100644
--- a/app/models/custom_workflow.rb
+++ b/app/models/custom_workflow.rb
@@ -33,13 +33,12 @@ class CustomWorkflow < ActiveRecord::Base
   validates_uniqueness_of :name, :case_sensitive => false
   validates_format_of :author, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, :allow_blank => true
   validate :validate_syntax, :validate_scripts_presence, :if => Proc.new {|workflow| workflow.respond_to?(:observable) and workflow.active?}
-  
+
   scope :active, lambda { where(:active => true) }
   scope :for_project, (lambda do |project|
     where("is_for_all=? OR EXISTS (SELECT * FROM #{reflect_on_association(:projects).join_table} WHERE project_id=? AND custom_workflow_id=id)",
           true, project.id)
   end)
-  scope :observing, lambda { |observable| where(:observable => observable) }
 
   def self.import_from_xml(xml)
     attributes = Hash.from_xml(xml).values.first
@@ -55,7 +54,7 @@ class CustomWorkflow < ActiveRecord::Base
   end
 
   def self.run_shared_code(object)
-    workflows = CustomWorkflow.observing(:shared).active
+    workflows = CustomWorkflow.active.where(:observable => :shared)
     log_message '= Running shared code', object
     workflows.each do |workflow|
       unless workflow.run(object, :shared_code)
diff --git a/app/views/projects/settings/_custom_workflow.html.erb b/app/views/projects/settings/_custom_workflow.html.erb
index 85474f4..9d0a963 100644
--- a/app/views/projects/settings/_custom_workflow.html.erb
+++ b/app/views/projects/settings/_custom_workflow.html.erb
@@ -3,9 +3,10 @@
   <%= hidden_field_tag 'project[custom_workflow_ids][]', '' %>
   <fieldset>
     <legend><%= l(:text_select_project_custom_workflows) %></legend>
-    <% if CustomWorkflow.observing(CustomWorkflow::PROJECT_OBSERVABLES).exists? %>
+    <% cws = CustomWorkflow.where(observable: CustomWorkflow::PROJECT_OBSERVABLES) %>
+    <% if cws.any? %>
     <dl>
-      <% CustomWorkflow.observing(CustomWorkflow::PROJECT_OBSERVABLES).each do |w| %>
+      <% cws.find_each do |w| %>
         <dt class="<%= 'disabled' unless w.active? %>">
           <label>
             <%= check_box_tag 'project[custom_workflow_ids][]', w.id, @project.custom_workflow_ids.include?(w.id) || w.is_for_all?, :disabled => w.is_for_all? %> <%= w.name %>