diff --git a/Source/Text/SvgTextBase.cs b/Source/Text/SvgTextBase.cs
index 9467f53c7350f4c8f45c29de40fb0530b0b135b4..58ab6dd6ca955776d53ea087e1b62b8bedceb2c2 100644
--- a/Source/Text/SvgTextBase.cs
+++ b/Source/Text/SvgTextBase.cs
@@ -325,7 +325,7 @@ namespace Svg
 
                 if (textNode == null)
                 {
-                    if (!string.IsNullOrEmpty(node.Content)) state.DrawString(PrepareText(node.Content));
+                    if (!string.IsNullOrEmpty(node.Content)) state.DrawString(PrepareText(node.Content));
                 }
                 else
                 {
@@ -838,11 +838,13 @@ namespace Svg
                         var xOffset = 0f; //_xAnchor - minX;
                         switch (Element.TextAnchor)
                         {
-                            case SvgTextAnchor.Middle:
-                                xOffset -= (maxX - minX) / 2;
+                            case SvgTextAnchor.Middle:
+                                if (_anchoredPaths.Count() == 1) xOffset -= this.TextBounds.Width / 2; 
+                                else xOffset -= (maxX - minX) / 2;
                                 break;
                             case SvgTextAnchor.End:
-                                xOffset -= (maxX - minX);
+                                if (_anchoredPaths.Count() == 1) xOffset -= this.TextBounds.Width;
+                                else xOffset -= (maxX - minX); 
                                 break;
                         }
 
diff --git a/Tests/W3CTestSuite/png/__issue-385-01_Test_text-anchor-middle.PNG b/Tests/W3CTestSuite/png/__issue-385-01_Test_text-anchor-middle.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..34b6fb2b30bcad854aabc7e7455fabfd04782e26
Binary files /dev/null and b/Tests/W3CTestSuite/png/__issue-385-01_Test_text-anchor-middle.PNG differ
diff --git a/Tests/W3CTestSuite/svg/__issue-385-01_Test_text-anchor-middle.svg b/Tests/W3CTestSuite/svg/__issue-385-01_Test_text-anchor-middle.svg
new file mode 100644
index 0000000000000000000000000000000000000000..bfb92013285669f5951b982664fe2c02b96d17f3
--- /dev/null
+++ b/Tests/W3CTestSuite/svg/__issue-385-01_Test_text-anchor-middle.svg
@@ -0,0 +1,47 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="400" height="400">
+  <defs>
+    <style>
+
+      .cls-3 {
+        fill: #ac3228;
+        font-size: 100px;
+      }
+
+      .cls-3, .cls-5 {
+        font-family: SegoeUI-Bold, Segoe UI;
+        font-weight: 700;
+      }
+
+      .cls-4, .cls-5 {
+        font-size: 50px;
+      }
+
+      .cls-4 {
+        font-family: SegoeUI, Segoe UI;
+      }
+
+    </style>
+  </defs>
+  <g id="Test_middle_alignment" >
+    
+    <text id="text_name" display="" class="cls-5" text-anchor="middle" x="50%" y="25%">HH</text>
+    <text id="text_name_fit" class="cls-5" textLength="100%" lengthAdjust="spacingAndGlyphs" x="0" y="100%">8888888</text>
+
+	<text id="text_value" class="cls-3" text-anchor="middle" x="50%" y="50%">080</text>
+
+    <text id="text_unit" class="cls-4" text-anchor="middle" x="50%" y="75%">HVH</text>
+
+    
+	<g id="TestSizeAlignment" style="stroke:rgb(255,0,0);stroke-width:3;fill:none;opacity:0.5" >
+		<line x1="50%" y1="0" x2="50%" y2="100%"  />
+		<line x1="0" y1="50%" x2="100%" y2="50%"  />
+		<rect x="0" y="0" width="100%" height="100%"  />
+		<line x1="0" y1="25%" x2="100%" y2="25%"  />
+		<line x1="0" y1="75%" x2="100%" y2="75%"  />
+
+		
+    </g>
+	
+	
+  </g>
+</svg>