diff --git a/eng/common/docgeneration/templates/matthews/partials/class.header.tmpl.partial b/eng/common/docgeneration/templates/matthews/partials/class.header.tmpl.partial
index 49a27d82732..db73a4bddb2 100644
--- a/eng/common/docgeneration/templates/matthews/partials/class.header.tmpl.partial
+++ b/eng/common/docgeneration/templates/matthews/partials/class.header.tmpl.partial
@@ -87,14 +87,14 @@
{{/syntax.typeParameters.0}}
-{{#remarks}}
-
-
-{{/remarks}}
-
{{#example.0}}
-{{__global.examples}}
+{{__global.examples}}
{{/example.0}}
{{#example}}
{{{.}}}
{{/example}}
+
+{{#remarks}}
+
+
+{{/remarks}}
\ No newline at end of file
diff --git a/eng/common/docgeneration/templates/matthews/partials/class.tmpl.partial b/eng/common/docgeneration/templates/matthews/partials/class.tmpl.partial
index 5f00b822cc7..37a69fa1c4e 100644
--- a/eng/common/docgeneration/templates/matthews/partials/class.tmpl.partial
+++ b/eng/common/docgeneration/templates/matthews/partials/class.tmpl.partial
@@ -132,11 +132,6 @@
{{/definition}}
{{/implements}}
-{{#remarks}}
-
-
-{{/remarks}}
-
{{#example.0}}
{{__global.examples}}
{{/example.0}}
@@ -144,6 +139,11 @@
{{{.}}}
{{/example}}
+{{#remarks}}
+
+
+{{/remarks}}
+
{{#exceptions.0}}
{{__global.exceptions}}