Fixed match-maker algo to work