diff --git a/CHANGELOG.md b/CHANGELOG.md
index 141d951..53ef805 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # v0.0.2rc
 
+* Fixes escaped HTML in the will_paginate links
 * Includes vendor in gemspec file manifest
 
 # v0.0.1
diff --git a/lib/paginated_table/view_helpers.rb b/lib/paginated_table/view_helpers.rb
index 3ee95c8..573e309 100644
--- a/lib/paginated_table/view_helpers.rb
+++ b/lib/paginated_table/view_helpers.rb
@@ -146,7 +146,7 @@ def sort_link(text, sort_on)
 
     def tag(name, value, attributes = {})
       if name == :a
-        @template.link_to(value, attributes.delete(:href), attributes.merge(:remote => true))
+        @template.link_to(value.to_s.html_safe, attributes.delete(:href), attributes.merge(:remote => true))
       else
         super
       end
diff --git a/test/units/view_helpers_test.rb b/test/units/view_helpers_test.rb
index a0bf6c9..a3da664 100644
--- a/test/units/view_helpers_test.rb
+++ b/test/units/view_helpers_test.rb
@@ -137,8 +137,10 @@ module PaginatedTable
 
     describe "#tag" do
       it "calls link_to on the view with the :remote option for :a tags" do
+        html_safe_text = stub("html_safe_text")
+        text = stub("text", :to_s => stub("string", :html_safe => html_safe_text))
         view.expects(:link_to).
-          with(text, href, { :class => 'highlight', :remote => true }).
+          with(html_safe_text, href, { :class => 'highlight', :remote => true }).
           returns(link)
         renderer.tag(:a, text, :class => 'highlight', :href => href).must_equal link
       end