Corrected errors on matching