Fix issue with matcher