1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/String.cpp b/src/common/String.cpp
index 30f83174..65d303fb 100644
--- a/src/common/String.cpp
+++ b/src/common/String.cpp
@@ -214,11 +214,11 @@ std::string String::ToUtf8() const {
 Index String::IndexFromCodeUnitToCodePoint(Index code_unit_index) const {
   auto iter = CodePointIterator();
   Index result = 0;
-  while (iter.GetPosition() <= code_unit_index && !iter.IsPastEnd()) {
+  while (iter.GetPosition() < code_unit_index && !iter.IsPastEnd()) {
     ++iter;
     ++result;
   }
-  return result - 1;
+  return result;
 }
 
 Index String::IndexFromCodePointToCodeUnit(Index code_point_index) const {