diff --git a/app/views/trace/_trace.html.erb b/app/views/trace/_trace.html.erb
index d38fa2f4c..4cd40352a 100644
--- a/app/views/trace/_trace.html.erb
+++ b/app/views/trace/_trace.html.erb
@@ -27,9 +27,7 @@
     <%= t'trace.trace.by' %> <%=link_to h(trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => trace.user.display_name} %>
     <% if !trace.tags.empty? %>
       <%= t'trace.trace.in' %> 
-      <% trace.tags.each_with_index do |tag, index| %>
-        <%= link_to_tag tag.tag %><%=', ' if index+1 < trace.tags.count %>
-      <% end %>
+      <%= trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ") %>
     <% end %>
   </td>
 </tr>
diff --git a/app/views/trace/view.html.erb b/app/views/trace/view.html.erb
index 1001cadf9..4ab46bd3e 100644
--- a/app/views/trace/view.html.erb
+++ b/app/views/trace/view.html.erb
@@ -36,9 +36,7 @@
     <td><%= t'trace.view.tags' %></td>
     <td>
     <% unless @trace.tags.empty? %>
-      <% @trace.tags.each_with_index do |tag, index| %>
-        <%= link_to tag.tag, { :controller => 'trace', :action => 'list', :tag => tag.tag, :id => nil } %><%=', ' if index+1 < @trace.tags.count %>
-      <% end %>
+      <%= @trace.tags.collect { |tag| link_to tag.tag, { :controller => 'trace', :action => 'list', :tag => tag.tag, :id => nil } }.join(", ") %>
     <% else %>
       <i><%= t'trace.view.none' %></i>
     <% end %>