diff --git a/src/OT/Layout/Common/Coverage.hh b/src/OT/Layout/Common/Coverage.hh
index fbd7c642a..862767191 100644
--- a/src/OT/Layout/Common/Coverage.hh
+++ b/src/OT/Layout/Common/Coverage.hh
@@ -147,8 +147,8 @@ struct Coverage
     TRACE_SUBSET (this);
     auto it =
     + iter ()
-    | hb_filter (c->plan->glyph_map_gsub)
     | hb_map_retains_sorting (c->plan->glyph_map_gsub)
+    | hb_filter (hb_map_filter_invalid)
     ;
 
     // Cache the iterator result as it will be iterated multiple times
diff --git a/src/hb-map.hh b/src/hb-map.hh
index bfb1b3f76..f5f180e9b 100644
--- a/src/hb-map.hh
+++ b/src/hb-map.hh
@@ -451,6 +451,8 @@ struct hb_map_t : hb_hashmap_t<hb_codepoint_t,
   hb_map_t (const Iterable &o) : hashmap (o) {}
 };
 
+static inline bool hb_map_filter_invalid (hb_codepoint_t _) { return _ != HB_MAP_VALUE_INVALID; }
+
 template <typename K, typename V>
 static inline
 hb_hashmap_t<K, V>* hb_hashmap_create ()