diff --git a/src/hb-ot-layout-gpos-table.hh b/src/hb-ot-layout-gpos-table.hh
index c9afd3154..41168b2e0 100644
--- a/src/hb-ot-layout-gpos-table.hh
+++ b/src/hb-ot-layout-gpos-table.hh
@@ -1543,7 +1543,7 @@ struct PosLookup : Lookup
     while (c->buffer->idx < c->buffer->len)
     {
       if ((c->buffer->cur().mask & c->lookup_mask) &&
-	  c->digest->may_have (c->buffer->cur().codepoint) &&
+	  c->digest.may_have (c->buffer->cur().codepoint) &&
 	  apply_once (c))
 	ret = true;
       else
diff --git a/src/hb-ot-layout-gsub-table.hh b/src/hb-ot-layout-gsub-table.hh
index b836df9e3..d91f92647 100644
--- a/src/hb-ot-layout-gsub-table.hh
+++ b/src/hb-ot-layout-gsub-table.hh
@@ -1211,7 +1211,7 @@ struct SubstLookup : Lookup
 	while (c->buffer->idx < c->buffer->len)
 	{
 	  if ((c->buffer->cur().mask & c->lookup_mask) &&
-	      c->digest->may_have (c->buffer->cur().codepoint) &&
+	      c->digest.may_have (c->buffer->cur().codepoint) &&
 	      apply_once (c))
 	    ret = true;
 	  else
@@ -1227,7 +1227,7 @@ struct SubstLookup : Lookup
 	do
 	{
 	  if ((c->buffer->cur().mask & c->lookup_mask) &&
-	      c->digest->may_have (c->buffer->cur().codepoint) &&
+	      c->digest.may_have (c->buffer->cur().codepoint) &&
 	      apply_once (c))
 	    ret = true;
 	  else
diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh
index 7a3f32eaa..bb43ade95 100644
--- a/src/hb-ot-layout-gsubgpos-private.hh
+++ b/src/hb-ot-layout-gsubgpos-private.hh
@@ -110,7 +110,7 @@ struct hb_apply_context_t
   unsigned int debug_depth;
   const GDEF &gdef;
   bool has_glyph_classes;
-  const hb_set_digest_t *digest;
+  const hb_set_digest_t digest;
 
 
   hb_apply_context_t (hb_font_t *font_,
@@ -127,7 +127,7 @@ struct hb_apply_context_t
 			      !HB_SHAPER_DATA_IS_INVALID (hb_ot_layout_from_face (face_)) ?
 			      *hb_ot_layout_from_face (face_)->gdef : Null(GDEF)),
 			has_glyph_classes (gdef.has_glyph_classes ()),
-			digest (digest_) {}
+			digest (*digest_) {}
 
   void set_lookup (const Lookup &l) {
     lookup_props = l.get_props ();