Fix problems with matcher