diff --git a/lib/middleman/core_extensions/front_matter.rb b/lib/middleman/core_extensions/front_matter.rb
index 28c662fe..86f2cfce 100644
--- a/lib/middleman/core_extensions/front_matter.rb
+++ b/lib/middleman/core_extensions/front_matter.rb
@@ -25,7 +25,7 @@ module Middleman::CoreExtensions::FrontMatter
         relative_path = path.sub(source_dir, "")
 
         data = if frontmatter.has_data?(relative_path)
-          frontmatter.data(relative_path).first
+          frontmatter.data(relative_path)
         else
           {}
         end
@@ -78,7 +78,7 @@ module Middleman::CoreExtensions::FrontMatter
         
       if result
         file = file.sub(@app.source_dir, "")
-        @local_data[file] = result
+        @local_data[file] = result[0]
         path = File.join(@app.source_dir, file)
         @app.cache.set([:raw_template, path], result[1])
       end