Working +endmatch support