diff --git a/util/shape-consumer.hh b/util/shape-consumer.hh
index 2b86a3c01..8fd7ec3a2 100644
--- a/util/shape-consumer.hh
+++ b/util/shape-consumer.hh
@@ -51,11 +51,11 @@ struct shape_consumer_t
   {
     output.new_line ();
 
-    output.consume_text (buffer, text, text_len, shaper.utf8_clusters);
-
     for (unsigned int n = shaper.num_iterations; n; n--)
     {
       shaper.populate_buffer (buffer, text, text_len, text_before, text_after);
+      if (n == 1)
+	output.consume_text (buffer, text, text_len, shaper.utf8_clusters);
       if (!shaper.shape (font, buffer)) {
 	failed = true;
 	hb_buffer_set_length (buffer, 0);