diff --git a/lib/gollum/app.rb b/lib/gollum/app.rb
index cfe66cf4..f9c40d57 100644
--- a/lib/gollum/app.rb
+++ b/lib/gollum/app.rb
@@ -642,7 +642,7 @@ module Precious
 
     def load_template(path)
       template_page = wiki_page(::File.join(path, '_Template')).page || wiki_page('/_Template').page
-      template_page ? Gollum::TemplateFilter.apply_filters(template_page.raw_data) : nil
+      template_page ? Gollum::TemplateFilter.apply_filters(template_page.text_data) : nil
     end
 
     def update_wiki_page(wiki, page, content, commit, name = nil, format = nil)
diff --git a/test/test_app.rb b/test/test_app.rb
index be0e2df7..c6da4552 100644
--- a/test/test_app.rb
+++ b/test/test_app.rb
@@ -328,7 +328,7 @@ EOF
   test "create with template succeed if template exists" do
     Precious::App.set(:wiki_options, { :template_page => true })
     page='_Template'
-    post '/gollum/create', :content => 'fake template', :page => page,
+    post '/gollum/create', :content => 'fake template with some Utf-8: Ü', :page => page,
       :path               => '/', :format => 'markdown', :message => ''
     follow_redirect!      
     assert last_response.ok?