fix rematchers