diff --git a/app/views/deliverables/_deliverable.html.erb b/app/views/deliverables/_deliverable.html.erb
index 25bec98..5253cc5 100644
--- a/app/views/deliverables/_deliverable.html.erb
+++ b/app/views/deliverables/_deliverable.html.erb
@@ -30,10 +30,12 @@
               <%= content_tag(:p,link_to("Edit", :action => 'edit', :id => @project.id, :deliverable_id => deliverable.id)) -%>
               <%= content_tag(:p,link_to("Delete", { :action => 'destroy', :id => @project.id, :deliverable_id => deliverable.id}, :confirm => l(:text_are_you_sure))) -%>
               <div>
-                <%= form_tag(:action => 'bulk_assign_issues', :id => @project.id, :deliverable_id => deliverable.id) %>
+                <% form_for :deliverable, deliverable, :url => { :action => "bulk_assign_issues",  :id => @project.id, :deliverable_id => deliverable.id} do |f| %>
+
                 <label for="version_id">Assign issues on Version to Deliverable</label>
                 <%= select("version", "id", @project.versions.sort.collect {|v| [v.name, v.id ] }, { :include_blank => true }) %>
-                <%= submit_tag(l(:button_change)) %></form>
+                <%= submit_tag(l(:button_change)) %>
+                <% end %>
               </div>
     </td>
     </tr>
diff --git a/app/views/deliverables/_list.html.erb b/app/views/deliverables/_list.html.erb
index 7d32cb8..5cb5f61 100644
--- a/app/views/deliverables/_list.html.erb
+++ b/app/views/deliverables/_list.html.erb
@@ -1,4 +1,3 @@
-<% form_tag({}) do -%>	
 <table id="deliverable-list" class="list deliverables">
     <thead><tr>
       <%= sort_header_tag("#{Deliverable.table_name}.id", :caption => '#', :default_order => 'desc') %>
@@ -16,4 +15,4 @@
     <% end -%>
   </tbody>
 </table>
-<% end -%>
+