fix problems with matcher