diff --git a/app/views/blocks/tags.html.erb b/app/views/blocks/tags.html.erb
index db30dfd..cd639ba 100644
--- a/app/views/blocks/tags.html.erb
+++ b/app/views/blocks/tags.html.erb
@@ -1,4 +1,5 @@
-<%= block_title(block.title) %>
+<% extend TagsHelper %>
+<%= block_title(block.title, block.subtitle) %>
 
 <%
   is_env = block.owner.class == Environment
diff --git a/test/functional/profile_design_controller_test.rb b/test/functional/profile_design_controller_test.rb
index 536f093..225bf63 100644
--- a/test/functional/profile_design_controller_test.rb
+++ b/test/functional/profile_design_controller_test.rb
@@ -711,4 +711,10 @@ class ProfileDesignControllerTest < ActionController::TestCase
     end
   end
 
+  should 'not fail when a profile has a tag block' do
+    a = create(Article, :name => 'my article', :profile_id => holder.id, :tag_list => 'tag')
+    @box1.blocks << TagsBlock.new
+    get :index, :profile => 'designtestuser'
+  end
+
 end
--
libgit2 0.21.2