Fix issue with using extra vars in the matching side