Solving UPC Mix-up Issue