diff --git a/app/models/custom_workflow.rb b/app/models/custom_workflow.rb
index e23cd46..4a78e53 100644
--- a/app/models/custom_workflow.rb
+++ b/app/models/custom_workflow.rb
@@ -155,7 +155,7 @@ class CustomWorkflow < ActiveRecord::Base
             object.send :instance_variable_set, :@attachment, Attachment.new
             object.send :instance_variable_set, :@page, object
         end
-        CustomWorkflow.run_shared_code self
+        CustomWorkflow.run_shared_code object
         [:before_add, :after_add, :before_remove, :after_remove].each {|field| validate_syntax_for object, field}
     end
   end
diff --git a/app/views/custom_workflows/_form.html.erb b/app/views/custom_workflows/_form.html.erb
index d4c8ab3..6c8b84a 100644
--- a/app/views/custom_workflows/_form.html.erb
+++ b/app/views/custom_workflows/_form.html.erb
@@ -92,7 +92,7 @@
     <% end %>
     <%= render :layout => 'layouts/collapsible',
                :locals => {
-                   :collapsed => (not (@workflow.before_destroy.present? or @workflow.before_destroy.present?)),
+                   :collapsed => (not (@workflow.before_destroy.present? or @workflow.after_destroy.present?)),
                    :label => l(:label_destroy_workflows)} do %>
       <div class="splitcontent">
         <div class="splitcontentleft">