diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpCodeVisitor.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpCodeVisitor.cs
index 3355e26685..a29ac498b5 100644
--- a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpCodeVisitor.cs
+++ b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpCodeVisitor.cs
@@ -308,7 +308,7 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp
             Writer.WriteEndMethodInvocation();
         }
 
-        private void CreateCodeMapping(string code, Chunk chunk)
+        public void CreateCodeMapping(string code, Chunk chunk)
         {
             using (CSharpLineMappingWriter mappingWriter = Writer.BuildLineMapping(chunk.Start, code.Length, Context.SourceFile))
             {
diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpTypeMemberVisitor.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpTypeMemberVisitor.cs
index c35d17395e..eb5b84df07 100644
--- a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpTypeMemberVisitor.cs
+++ b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpTypeMemberVisitor.cs
@@ -4,17 +4,19 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp
 {
     public class CSharpTypeMemberVisitor : CodeVisitor<CSharpCodeWriter>
     {
+        private CSharpCodeVisitor _csharpCodeVisitor;
+
         public CSharpTypeMemberVisitor(CSharpCodeWriter writer, CodeGeneratorContext context)
-            : base(writer, context) { }
+            : base(writer, context)
+        {
+            _csharpCodeVisitor = new CSharpCodeVisitor(writer, context);
+        }
 
         protected override void Visit(TypeMemberChunk chunk)
         {
             if (!String.IsNullOrEmpty(chunk.Code))
             {
-                using (Writer.BuildLineMapping(chunk.Start, chunk.Code.Length, Context.SourceFile))
-                {
-                    Writer.WriteLine(chunk.Code);
-                }
+                _csharpCodeVisitor.CreateCodeMapping(chunk.Code, chunk);
             }
         }
     }