Reduce unnecessary re-matching