fix rematchers more