diff --git a/core/fpdftext/cpdf_textpage.cpp b/core/fpdftext/cpdf_textpage.cpp
index b355cc9..e138515 100644
--- a/core/fpdftext/cpdf_textpage.cpp
+++ b/core/fpdftext/cpdf_textpage.cpp
@@ -1075,8 +1075,7 @@
     charinfo.m_CharBox.bottom = rect.bottom * fFontSize + item.m_Origin.y;
     if (fabsf(charinfo.m_CharBox.top - charinfo.m_CharBox.bottom) <
         kSizeEpsilon) {
-      charinfo.m_CharBox.top =
-          charinfo.m_CharBox.bottom + pTextObj->GetFontSize();
+      charinfo.m_CharBox.top = charinfo.m_CharBox.bottom + fFontSize;
     }
     if (fabsf(charinfo.m_CharBox.right - charinfo.m_CharBox.left) <
         kSizeEpsilon) {
diff --git a/fpdfsdk/fpdf_text_embeddertest.cpp b/fpdfsdk/fpdf_text_embeddertest.cpp
index 56b2b27..73754ec 100644
--- a/fpdfsdk/fpdf_text_embeddertest.cpp
+++ b/fpdfsdk/fpdf_text_embeddertest.cpp
@@ -175,7 +175,7 @@
   EXPECT_NEAR(20.847, left, 0.001);
   EXPECT_NEAR(135.167, right, 0.001);
   EXPECT_NEAR(96.655, bottom, 0.001);
-  EXPECT_NEAR(116.000, top, 0.001);
+  EXPECT_NEAR(111.648, top, 0.001);
 
   // Test out of range indicies set outputs to (0.0, 0.0, 0.0, 0.0).
   left = -1.0;
@@ -1643,8 +1643,7 @@
     EXPECT_DOUBLE_EQ(86.0, left);
     EXPECT_DOUBLE_EQ(88.400001525878906, right);
     EXPECT_DOUBLE_EQ(50.0, bottom);
-    // TODO(crbug.com/pdfium/1591): The top value is too big.
-    EXPECT_DOUBLE_EQ(290.0, top);
+    EXPECT_DOUBLE_EQ(50.240001678466797, top);
     ASSERT_TRUE(
         FPDFText_GetCharBox(text_page.get(), 3, &left, &right, &bottom, &top));
     EXPECT_DOUBLE_EQ(86.010002136230469, left);