Fix matchmaker