1 files changed, 1 insertions, 1 deletions

diff --git a/src/composite.c b/src/composite.c
index 367fc8e3f9f..40cef814c1d 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -1412,7 +1412,7 @@ composition_update_it (struct composition_it *cmp_it, ptrdiff_t charpos, ptrdiff
       cmp_it->width = 0;
       for (i = cmp_it->nchars - 1; i >= 0; i--)
         {
-          c = XINT (LGSTRING_CHAR (gstring, i));
+          c = XINT (LGSTRING_CHAR (gstring, cmp_it->from + i));
           cmp_it->nbytes += CHAR_BYTES (c);
           cmp_it->width += CHAR_WIDTH (c);
         }