diff --git a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb
index b4c2d99f..94a3177e 100644
--- a/middleman-core/lib/middleman-core/core_extensions/front_matter.rb
+++ b/middleman-core/lib/middleman-core/core_extensions/front_matter.rb
@@ -115,15 +115,13 @@ module Middleman::CoreExtensions
 
         if result = parse_yaml_front_matter(content)
           data, content = result
-          data = ::Middleman::Util.recursively_enhance(data).freeze
         elsif result = parse_json_front_matter(content)
           data, content = result
-          data = ::Middleman::Util.recursively_enhance(data).freeze
         else
           data = {}
         end
 
-        [data, content]
+        [::Middleman::Util.recursively_enhance(data).freeze, content]
       end
       
       def normalize_path(path)
@@ -185,4 +183,4 @@ module Middleman::CoreExtensions
     
     end
   end
-end
\ No newline at end of file
+end