diff --git a/src/hb-ot-shape-normalize.cc b/src/hb-ot-shape-normalize.cc
index b9834ca10..0bcf7f58a 100644
--- a/src/hb-ot-shape-normalize.cc
+++ b/src/hb-ot-shape-normalize.cc
@@ -269,6 +269,7 @@ _hb_ot_shape_normalize (hb_font_t *font, hb_buffer_t *buffer,
     {
       /* Composes. Modify starter and carry on. */
       buffer->out_info[starter].codepoint = composed;
+      /* XXX update cluster */
       set_unicode_props (&buffer->out_info[starter], buffer->unicode);
 
       buffer->skip_glyph ();