Fix combo matchmaker