diff --git a/helpers/content.go b/helpers/content.go
index d1b3d787d..e955b0004 100644
--- a/helpers/content.go
+++ b/helpers/content.go
@@ -203,9 +203,8 @@ func getHTMLRenderer(defaultFlags int, ctx *RenderingContext) blackfriday.Render
 	}
 
 	return &HugoHTMLRenderer{
-		FileResolver: ctx.FileResolver,
-		LinkResolver: ctx.LinkResolver,
-		Renderer:     blackfriday.HtmlRendererWithParameters(htmlFlags, "", "", renderParameters),
+		RenderingContext: ctx,
+		Renderer:         blackfriday.HtmlRendererWithParameters(htmlFlags, "", "", renderParameters),
 	}
 }
 
diff --git a/helpers/content_renderer.go b/helpers/content_renderer.go
index 1613d7613..60ed46e73 100644
--- a/helpers/content_renderer.go
+++ b/helpers/content_renderer.go
@@ -29,8 +29,7 @@ type FileResolverFunc func(ref string) (string, error)
 // HugoHTMLRenderer wraps a blackfriday.Renderer, typically a blackfriday.Html
 // Enabling Hugo to customise the rendering experience
 type HugoHTMLRenderer struct {
-	FileResolver FileResolverFunc
-	LinkResolver LinkResolverFunc
+	*RenderingContext
 	blackfriday.Renderer
 }