diff --git a/src/hb-directwrite.cc b/src/hb-directwrite.cc
index 5b191262a..4b4e77b4b 100644
--- a/src/hb-directwrite.cc
+++ b/src/hb-directwrite.cc
@@ -637,11 +637,13 @@ _hb_directwrite_shape (hb_shape_plan_t    *shape_plan,
   static_assert ((sizeof (DWRITE_FONT_FEATURE) == sizeof (hb_ms_feature_t)), "");
   hb_vector_t<hb_ms_features_t *> range_features;
   hb_vector_t<uint32_t> range_char_counts;
+
+  hb_vector_t<hb_ms_feature_t> feature_records;
+  hb_vector_t<hb_ms_range_record_t> range_records;
   if (num_features)
   {
-    hb_vector_t<hb_ms_feature_t> feature_records;
-    hb_vector_t<hb_ms_range_record_t> range_records;
     if (hb_ms_setup_features (features, num_features, feature_records, range_records))
+    {
       hb_ms_make_feature_ranges (feature_records,
 				 range_records,
 				 0,
@@ -649,6 +651,7 @@ _hb_directwrite_shape (hb_shape_plan_t    *shape_plan,
 				 log_clusters,
 				 range_features,
 				 range_char_counts);
+    }
   }
 
   uint16_t* clusterMap;
diff --git a/test/shape/data/in-house/tests/directwrite.tests b/test/shape/data/in-house/tests/directwrite.tests
index 334f234f6..88a1ee9b9 100644
--- a/test/shape/data/in-house/tests/directwrite.tests
+++ b/test/shape/data/in-house/tests/directwrite.tests
@@ -1 +1,2 @@
 ../fonts/872d2955d326bd6676a06f66b8238ebbaabc212f.ttf;--shaper=directwrite;U+0628,U+0628,U+0628;[uni0628.fina=2+883|uni0628.medi_High=1+244|uni0628.init_High=0+233]
+../fonts/872d2955d326bd6676a06f66b8238ebbaabc212f.ttf;--shaper=directwrite --features=-calt;U+0628,U+0628,U+0628;[uni0628.fina=2+883|uni0628.medi=1+244|uni0628.init=0+190]