The invention regards a method and a system for establishing correspondence between wafers and solar cells produced from said wafers. The method comprises for each wafer and each solar cell, providing an image of the wafer, providing an image of the cell, comparing the wafer image to the cell image, upon match between a cell image and a wafer image, assigning the current cell to the current wafer. The system comprises at least one imaging device for providing images of the wafers and the cells, a processing unit for comparing a wafer image to a cell image, and upon match between a cell image and a wafer image, assigning the current cell to the current wafer, and a memory unit.