Fix problem with matcher