fixed unreachable/untested shim for matches