Matching bug

We merged too fast. The matching validation doesn't work if we really want to match

Edited by Tobinsk