Fix to new matches issue