diff --git a/src/OT/glyf/Glyph.hh b/src/OT/glyf/Glyph.hh
index 94f2790f8..b7215b017 100644
--- a/src/OT/glyf/Glyph.hh
+++ b/src/OT/glyf/Glyph.hh
@@ -324,6 +324,11 @@ struct Glyph
 						    depth + 1)))
 	  return false;
 
+	/* Copy phantom points from component if USE_MY_METRICS flag set */
+	if (use_my_metrics && item.is_use_my_metrics ())
+	  for (unsigned int i = 0; i < PHANTOM_COUNT; i++)
+	    phantoms[i] = comp_points[comp_points.length - PHANTOM_COUNT + i];
+
 	/* Apply component transformation & translation */
 	item.transform_points (comp_points);
 
@@ -344,16 +349,11 @@ struct Glyph
 	  }
 	}
 
-	/* Copy phantom points from component if USE_MY_METRICS flag set */
-	if (use_my_metrics && item.is_use_my_metrics ())
-	  for (unsigned int i = 0; i < PHANTOM_COUNT; i++)
-	    phantoms[i] = comp_points[comp_points.length - PHANTOM_COUNT + i];
+	all_points.extend (comp_points.as_array ().sub_array (0, comp_points.length - PHANTOM_COUNT));
 
 	if (all_points.length > HB_GLYF_MAX_POINTS)
 	  return false;
 
-	all_points.extend (comp_points.as_array ().sub_array (0, comp_points.length - PHANTOM_COUNT));
-
 	comp_index++;
       }
 
@@ -395,6 +395,9 @@ struct Glyph
 
 	all_points.extend (comp_points.as_array ().sub_array (0, comp_points.length - PHANTOM_COUNT));
 
+	if (all_points.length > HB_GLYF_MAX_POINTS)
+	  return false;
+
 	points_left += item.get_num_points ();
       }
       all_points.extend (phantoms);