diff --git a/Changes b/Changes
index 906cac5..44a867a 100644
--- a/Changes
+++ b/Changes
@@ -15,6 +15,7 @@ Fixes:
 
 o Harden auto-compression against malformed streams
 o Add backup JPEG dimensions method in Cpdfimage
+o Correct object stream behaviour when splitting
 
 * = Supported by a grant from NLnet
 
diff --git a/cpdfua.ml b/cpdfua.ml
index b322265..68581ee 100644
--- a/cpdfua.ml
+++ b/cpdfua.ml
@@ -1494,7 +1494,7 @@ let check_unicode tu n =
 let matterhorn_31_028 _ _ pdf =
   iter
     (fun i ->
-      let tu = Pdftext.parse_tounicode pdf (Pdf.lookup_obj pdf i) in
+      let tu = (Pdfcmap.parse_tounicode pdf (Pdf.lookup_obj pdf i)).map in
         if check_unicode tu 0 then merror ())
     (all_tounicodes pdf)
 
@@ -1503,7 +1503,7 @@ let matterhorn_31_028 _ _ pdf =
 let matterhorn_31_029 _ _ pdf =
   iter
     (fun i ->
-      let tu = Pdftext.parse_tounicode pdf (Pdf.lookup_obj pdf i) in
+      let tu = (Pdfcmap.parse_tounicode pdf (Pdf.lookup_obj pdf i)).map in
         if check_unicode tu 0xFEFF || check_unicode tu 0xFFFE then merror ())
     (all_tounicodes pdf)