diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine.cpp
index e6da45df8cb..cbe4b0ad229 100644
--- a/jdk/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine.cpp
+++ b/jdk/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine.cpp
@@ -73,7 +73,7 @@ le_int32 GXLayoutEngine::computeGlyphs(const LEUnicode chars[], le_int32 offset,
 
     fMorphTable->process(fMorphTable, glyphStorage, success);
 
-    return count;
+    return glyphStorage.getGlyphCount();
 }
 
 // apply positional tables
diff --git a/jdk/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine2.cpp b/jdk/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine2.cpp
index d4e385097fc..0d437d6aead 100644
--- a/jdk/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine2.cpp
+++ b/jdk/src/java.desktop/share/native/libfontmanager/layout/GXLayoutEngine2.cpp
@@ -69,7 +69,7 @@ le_int32 GXLayoutEngine2::computeGlyphs(const LEUnicode chars[], le_int32 offset
     }
 
     fMorphTable->process(fMorphTable, glyphStorage, fTypoFlags, success);
-    return count;
+    return glyphStorage.getGlyphCount();
 }
 
 // apply positional tables