diff --git a/src/hb-ot-var-gvar-table.hh b/src/hb-ot-var-gvar-table.hh
index a1d3efcfd..949a83288 100644
--- a/src/hb-ot-var-gvar-table.hh
+++ b/src/hb-ot-var-gvar-table.hh
@@ -624,12 +624,12 @@ struct gvar
 	unsigned start_point = 0;
 	for (unsigned c = 0; c < end_points.length; c++)
 	{
-	  unsigned end_point = end_points[c];
+	  unsigned end_point = end_points.arrayZ[c];
 
 	  /* Check the number of unreferenced points in a contour. If no unref points or no ref points, nothing to do. */
 	  unsigned unref_count = 0;
 	  for (unsigned i = start_point; i <= end_point; i++)
-	    if (!deltas[i].flag) unref_count++;
+	    if (!deltas.arrayZ[i].flag) unref_count++;
 
 	  unsigned j = start_point;
 	  if (unref_count == 0 || unref_count > end_point - start_point)