Match: fixed and tested