diff --git a/src/hb-ot-hdmx-table.hh b/src/hb-ot-hdmx-table.hh
index 35d27f7fa..dc36d0ab5 100644
--- a/src/hb-ot-hdmx-table.hh
+++ b/src/hb-ot-hdmx-table.hh
@@ -125,14 +125,14 @@ struct hdmx
     if (unlikely (!hdmx_prime)) return_trace (false);
 
     auto it =
-    + hb_iota ((unsigned) numRecords)
+    + hb_range ((unsigned) numRecords)
     | hb_map ([&] (unsigned _)
 	{
 	  const DeviceRecord *device_record =
 	    &StructAtOffset<DeviceRecord> (&firstDeviceRecord,
 					   _ * sizeDeviceRecord);
 	  auto row =
-	    + hb_iota (c->plan->num_output_glyphs ())
+	    + hb_range (c->plan->num_output_glyphs ())
 	    | hb_map (c->plan->reverse_glyph_map)
 	    | hb_map ([=] (hb_codepoint_t _)
 		      {