fix non-group match