match_mask fix