diff --git a/src/hb-aat-layout-common-private.hh b/src/hb-aat-layout-common-private.hh
index 37a84bef6..2dcbd557c 100644
--- a/src/hb-aat-layout-common-private.hh
+++ b/src/hb-aat-layout-common-private.hh
@@ -658,6 +658,8 @@ struct StateTableDriver
 	  buffer->idx--;
 	  last_was_dont_advance = true;
 	}
+	else
+	  last_was_dont_advance = false;
       }
       else
         last_was_dont_advance = false;
diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc
index 64e118a75..fb8369d51 100644
--- a/src/hb-ot-shape.cc
+++ b/src/hb-ot-shape.cc
@@ -619,8 +619,8 @@ hb_ot_substitute_complex (hb_ot_shape_context_t *c)
   c->plan->substitute (c->font, buffer);
 
   /* XXX Call morx instead. */
-  //OT::hb_apply_context_t ac (0, c->font, c->buffer);
-  //hb_aat_layout_substitute (&ac);
+  OT::hb_apply_context_t ac (0, c->font, c->buffer);
+  hb_aat_layout_substitute (&ac);
 }
 
 static inline void