diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/Codepoint.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/Codepoint.cs
index ecd0681e15..8b9d1c1d02 100644
--- a/src/Avalonia.Base/Media/TextFormatting/Unicode/Codepoint.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/Codepoint.cs
@@ -231,7 +231,7 @@ namespace Avalonia.Media.TextFormatting.Unicode
         /// <param name="index">The index to read at.</param>
         /// <param name="count">The count of character that were read.</param>
         /// <returns></returns>
-        public static Codepoint ReadAt(ReadOnlySpan<char> text, int index, out int count)
+        public static Codepoint ReadAt(CharacterBufferRange text, int index, out int count)
         {
             count = 1;
 
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/CodepointEnumerator.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/CodepointEnumerator.cs
index a2e29812d3..a2c36d9a13 100644
--- a/src/Avalonia.Base/Media/TextFormatting/Unicode/CodepointEnumerator.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/CodepointEnumerator.cs
@@ -30,7 +30,7 @@ namespace Avalonia.Media.TextFormatting.Unicode
                 return false;
             }
 
-            Current = Codepoint.ReadAt(_text.Span, 0, out var count);
+            Current = Codepoint.ReadAt(_text, 0, out var count);
 
             _text = _text.Skip(count);
 
diff --git a/src/Avalonia.Base/Media/TextFormatting/Unicode/GraphemeEnumerator.cs b/src/Avalonia.Base/Media/TextFormatting/Unicode/GraphemeEnumerator.cs
index 2488b620e7..dc21e06813 100644
--- a/src/Avalonia.Base/Media/TextFormatting/Unicode/GraphemeEnumerator.cs
+++ b/src/Avalonia.Base/Media/TextFormatting/Unicode/GraphemeEnumerator.cs
@@ -245,7 +245,7 @@ namespace Avalonia.Media.TextFormatting.Unicode
 
                     if (CurrentCodeUnitOffset < _buffer.Length)
                     {
-                        CurrentCodepoint = Codepoint.ReadAt(_buffer.Span, CurrentCodeUnitOffset,
+                        CurrentCodepoint = Codepoint.ReadAt(_buffer, CurrentCodeUnitOffset,
                             out _codeUnitLengthOfCurrentScalar);
                     }
                     else
diff --git a/tests/Avalonia.UnitTests/MockTextShaperImpl.cs b/tests/Avalonia.UnitTests/MockTextShaperImpl.cs
index d010f9ebf2..00bcef295a 100644
--- a/tests/Avalonia.UnitTests/MockTextShaperImpl.cs
+++ b/tests/Avalonia.UnitTests/MockTextShaperImpl.cs
@@ -18,7 +18,7 @@ namespace Avalonia.UnitTests
             {
                 var glyphCluster = i + text.OffsetToFirstChar;
 
-                var codepoint = Codepoint.ReadAt(characterBufferRange.Span, i, out var count);
+                var codepoint = Codepoint.ReadAt(characterBufferRange, i, out var count);
 
                 var glyphIndex = typeface.GetGlyph(codepoint);