MARI-42 fixed matching logic