++fix matching based on the consume model.